Commit Graph

20539 Commits

Author SHA1 Message Date
Fox McCloud
4ba8c19e8b Merge pull request #3780 from Tastyfish/democracy
Fixes several midround antag/creature assignments not asking ghosts first
2016-03-08 13:28:43 -05:00
Fox McCloud
bb4626e8ce Merge pull request #3782 from Spacemanspark/I-dont-think-Satoshi-Tajiri-intended-for-this
Adds Lazarus Injector emag_act()
2016-03-08 13:28:22 -05:00
Fox McCloud
ee552629ab Merge pull request #3794 from Tastyfish/ragin
Fixes ragin mages ending after 1 mage
2016-03-08 03:44:12 -05:00
Tastyfish
3665631c9f Fixes ragin mages ending after 1 mage 2016-03-08 03:19:07 -05:00
Spacemanspark
c98cda3f55 Re-adds emp_act() to go alongside emag_act() 2016-03-07 19:54:39 -06:00
TheDZD
1f29799c76 Merge pull request #3769 from Fox-McCloud/edgy
Gives Mining Drills an Edge
2016-03-07 17:29:52 -05:00
Tastyfish
2d11b519e1 Removes players from pollCandidates consideration that have enabled antag hud 2016-03-07 16:21:09 -05:00
Spacemanspark
80f3b56318 Changes Lazarus Injector's emp_act() to an emag_act() 2016-03-07 11:18:02 -06:00
Tastyfish
636346f8ea Moves space pods to goonstation license folder 2016-03-07 04:05:47 -05:00
Tastyfish
0e0225b1ee Fixes several midround antag assignments not asking ghosts first 2016-03-07 03:03:45 -05:00
Fox McCloud
c3285d20ef Merge pull request #3777 from Tastyfish/wiznerd
Fixes lich spell preventing round end when viewed in the spellbook
2016-03-06 22:13:26 -05:00
Tastyfish
422a2e6ed4 Fixes lich spell preventing round end when viewed in the spellbook 2016-03-06 21:59:48 -05:00
Fox McCloud
92835e7493 Merge pull request #3776 from Tastyfish/lays-potato-layers
Fixes /datum/events, and by proxy the cable layer
2016-03-06 20:19:22 -05:00
Tastyfish
a4e3fc7905 Fixes /datum/events, and by proxy the cable layer 2016-03-06 20:08:37 -05:00
Tastyfish
38fe3b98fb Fixes PDA records apps when records deleted 2016-03-06 19:16:34 -05:00
TheDZD
d0ee1d2caa Merge pull request #3765 from tigercat2000/watchlist
Change Watchlist to use send2adminirc instead of send2irc_adminless_only
2016-03-06 12:58:33 -05:00
Fox-McCloud
488af2ac7a Gives Mining Drills and Edge 2016-03-06 04:33:21 -05:00
TheDZD
637e930352 Merge pull request #3761 from Fox-McCloud/surgery-tweaks
Surgery Tweaks
2016-03-05 22:47:06 -05:00
TheDZD
4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss
Removes Halloss
2016-03-05 22:39:19 -05:00
Tigercat2000
27c7810e04 Change Watchlist to use send2adminirc instead of send2irc_adminless_only 2016-03-05 11:44:26 -08:00
Fox-McCloud
4316775c1a Surgery Tweaks 2016-03-04 21:47:41 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud
bca54aae9e Experimentor Fixes 2016-03-04 08:31:32 -05:00
Fox-McCloud
c98e2ff7ce scream 2016-03-04 02:18:22 -05:00
Fox-McCloud
9fb3761417 fox is bad and should feel bad 2016-03-03 23:57:38 -05:00
Fox-McCloud
4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Fox McCloud
b5df688605 Merge pull request #3744 from Crazylemon64/human_icons_tweak
Changing a person's appearance now works better
2016-03-03 20:38:18 -05:00
Fox McCloud
60b0d6f2fe Merge pull request #3639 from Crazylemon64/matrix_and_path_editing
Adds matrix and path editing to the variable viewer
2016-03-03 20:31:25 -05:00
TheDZD
37e415909c Merge pull request #3740 from Crazylemon64/better_buildmode
Enhances the buildmode tool
2016-03-03 20:21:34 -05:00
TheDZD
9e05eedf52 Merge pull request #3724 from KasparoVy/redoes-redoing-suit-adjustment
Suit Adjustment Bugfixes, Fixes #3703, Fixes #3707 and Fixes #3752, Adds Blueshield Coat in_hands and Hulk Jacket Destruction
2016-03-03 20:20:37 -05:00
Fox McCloud
96785b1dbe Merge pull request #3757 from Tastyfish/neuromancer
Changes neurotoxin drink name because of name clash with supertoxin
2016-03-03 20:19:22 -05:00
TheDZD
c84ac16d58 Merge pull request #3748 from VampyrBytes/Emotess
fixes emotess
2016-03-03 20:16:36 -05:00
Crazylemon
8e63a9eea3 Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak 2016-03-03 16:20:15 -08:00
Tastyfish
5b76727d73 Changes neurotoxin drink name because of name clash with supertoxin 2016-03-03 15:26:55 -05:00
Fox McCloud
b95c24ef34 Merge pull request #3750 from FalseIncarnate/beach
Beach Expansion Update
2016-03-02 23:42:34 -05:00
FalseIncarnate
a9f9fcad8d "Consistency" 2016-03-02 22:15:33 -05:00
Fox McCloud
bd81ffc336 Merge pull request #3751 from Crazylemon64/medical_machines_fixes
Improves behavior of Cryo tubes and Cloning pods
2016-03-02 21:25:02 -05:00
Crazylemon64
85fdbb38c2 Cryotubes produce their message on insertion instead of removal now
Also, EMPing a cloning pod is a bit less janky, and correctly updates
icons now.
2016-03-02 08:08:04 -08:00
KasparoVy
b921c9a6c4 Redoes Redoing Suit Adjustment
@Regens1 for the special hulk joke. Haha?

Hulks can destroy jackets by trying to adjust them. In the case of labcoats, when you destroy it items in the pockets (not just the suit storage slot) will be dumped on the ground below you. Stuff in the suit storage slot already got dumped on the ground, so it didn't need any special treatment.

Fixes all known issues with any adjustable jackets using the wrong sprites, including the HoS jacket

Fixes #3707 and #3703. You can now adjust breath masks while buckled into beds or chairs.

Adds Missing Red Labcoat Sprites (found copies @ the Polaris repository).

Adds Blueshield coat in_hand icons
2016-03-02 03:08:05 -05:00
FalseIncarnate
ea3eff7651 Derp-code fix
Also adds a comment for someone else's code because they wanted me to.
2016-03-01 21:31:46 -05:00
FalseIncarnate
374c2db600 Beach Expansion Update
Expands the beach away mission to include a brand new scuba-diving area!
- Somewhat empty, but has a few points of interest scattered about and
can be added to in the future

Visually updates the beach
- Sand texture changed, and given randomization for a more varied
beachfront.
- The row of crates and lockers has been replaced with 3 changing
rooms/tents so you can change into that mankini in private.
- Changes the water texture to be less bland
- Expands the water area to give more room for swimmers to play in
before they reach the edge

Adds in the Diving Point Buoy and Diving Point Anchor objects, used to
transition between the beach surface and the underwater area
- Hit with an empty hand to transition between the two points

The underwater area has a few "minor" dangers to prepare for:
- Sea Carp
- These carp (unlike their space-faring cousins) won't attack on sight,
and will try to swim away when attacked. They still bite if they work up
the courage to come back.
- Water
- Water and lungs don't work well together, who knew!? Skrell, Neara,
and anyone who has NO_BREATHE can happily explore, while the rest will
want to pack some internals lest they begin to drown.
- Drowning in the scuba area doesn't require you to be lying down,
unlike the pool. You're in over your head (literally).
- Darkness
- Not quite a danger in itself, but it's easy to get disoriented in the
dark water, and that can be frustrating.

CODE STUFF
- Broke up the pool controller code into a couple procs for cleanliness
and in case we want to have a type of pool controller that doesn't drown
or doesn't adjust bodytemp
- Made ladders use forceMove instead of directly setting loc
- Removed an entirely unused area (/area/beach)

Crappy coder-sprites for Buoy and Anchor done by myself.
- Ok, they actually aren't THAT bad, but they aren't fantastic.
2016-03-01 21:02:15 -05:00
Fox McCloud
8cccf4f853 Merge pull request #3749 from Tastyfish/vendings
Fixes vending machines borking their inventory
2016-03-01 18:51:22 -05:00
Tastyfish
c093dc5cfa Fixes vending machines double-listing 2016-03-01 18:41:02 -05:00
Crazylemon64
b095d40952 i r inteligunt 2016-03-01 12:11:08 -08:00
Crazylemon64
d72a086cd5 Makes the DNA scrambler not give incorrect hairstyles 2016-03-01 11:40:39 -08:00
Crazy Lemon
962490bdac Merge pull request #3738 from Fox-McCloud/potatoes
Ensures there are Potatoes
2016-03-01 11:36:30 -08:00
Crazylemon64
91f025c04f This should make sure you don't lose your hairstyle when cloned 2016-03-01 09:35:21 -08:00
Crazylemon64
e7d34830cb Skeletons (from rotted bodies) no longer have a fleshy torso 2016-03-01 08:32:52 -08:00
VampyrBytes
c3c23a5497 fixes emotess
fixes #3727
Removes part of code that removed last character if it was an s
Hardcodes grammatical options for emotes into switch
Updated help emote with missing emotes
2016-03-01 10:29:16 +00:00
Crazylemon64
d53b462f1a Humans keep their name upon de-monkification 2016-02-29 23:03:59 -08:00