Commit Graph

35981 Commits

Author SHA1 Message Date
Trilbyspaceclone
dfbbbf3cfd //YAWN Edit 2019-09-27 18:38:21 -04:00
Trilbyspaceclone
5581955aae Update rig_pieces_vr.dm 2019-09-27 18:33:09 -04:00
Hawk_v3
7f0746e44c Clearing out some more.
NSFW is now the NSCW and the ML-3M is the ML-3.

Also, no, fluff items with TELEPORTERS are no bueno.
2019-09-23 21:40:26 +01:00
Hawk_v3
14be8a5dd9 Merge remote-tracking branch 'server/master' 2019-09-23 20:57:18 +01:00
Hawk_v3
4eb12d303c Merge remote-tracking branch 'origin/master' 2019-09-23 20:55:30 +01:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Atermonera
7b126e37b7 Merge pull request #6404 from Heroman3003/flappening
Makes airtight plastic flaps unmakeable
2019-09-22 19:53:30 -04:00
Novacat
9f4a6e0d13 Merge pull request #5938 from Novacat/nova-basicfixes
Subspace Radio slot bugfixes
2019-09-22 09:14:46 -04:00
Novacat
ab4240f4a3 Merge pull request #5929 from FelixRuin/пушки,-пушки-и-стволы
fix gun handle_suicide
2019-09-22 09:09:12 -04:00
Unknown
8392aa5202 Subspace Radio slot bugfixes
- Subspace Radio now can be slotted in hardsuit suit slots.
- Subspace Radio now works if slotted in a suit slot.
2019-09-22 09:05:21 -04:00
Heroman
b4d532ed4f Fixes grab having big delay on deletion after throws 2019-09-22 15:54:24 +10:00
Heroman
b40b509487 Fixes holder bugs 2019-09-22 06:39:55 +10:00
FelixRuin
93cf2d41e1 fix gun handle_suicide 2019-09-21 15:01:55 +03:00
Novacat
2519318de5 Update portable_turret.dm 2019-09-21 03:18:23 -04:00
Rykka
1252ba8482 Fixes it because polaris is silly 2019-09-21 01:15:47 -06:00
Rykka
2c694dbf62 Removes // start // end lasertag bits 2019-09-21 01:07:10 -06:00
Rykka
9dc5e6a44d Adds VOREStation Edit, pending Polaris port from buttlynx later. 2019-09-21 01:05:26 -06:00
Rykka
a4cb2a1449 Remove the "Lethal" setting from lasertag turrets 2019-09-21 00:57:49 -06:00
Rykka
42007762a0 Adds comment defining start of lasertag turret code 2019-09-21 00:23:02 -06:00
Unknown
bf7be873c9 Removes underscores
Should fix Resh's and Saveloy's fluff items? Maybe?
2019-09-20 17:48:14 -04:00
Novacat
311abbaefb Merge pull request #5896 from Novacat/nova-branchfix
Moves Planet definition to code
2019-09-20 16:39:53 -04:00
Novacat
a212bbe9ec Merge pull request #5890 from Mewchild/MC-Midpoint
Remakes the entire tether midpoint
2019-09-20 16:39:14 -04:00
Unknown
469047eb7c Gives basic hostile AI to Russians/Pirates 2019-09-20 13:30:59 -04:00
Novacat
d095d36e01 Merge pull request #5886 from Heroman3003/cell_loaded
Cell-Loaded Weapons reworks and implementations
2019-09-20 12:12:57 -04:00
Novacat
eee66a7ae2 Merge pull request #5912 from Rykka-Stormheart/shep-dev-waiter
Adds Server alt-title of Intern
2019-09-20 12:12:39 -04:00
Novacat
9f784dbd60 Merge pull request #5910 from Heroman3003/fushi
Makes sushi require fish meat
2019-09-20 12:12:29 -04:00
Novacat
7a43b97988 Merge pull request #5902 from Novacat/nova-weapons
Ports pan-slavic from Baystation
2019-09-20 12:12:13 -04:00
Novacat
bed2b14f1c Merge pull request #5898 from Heroman3003/nanonerf
Nerfs regular nanopaste, adds advanced one
2019-09-20 12:10:32 -04:00
Hawk-v3
a5ffc3e31d Merge branch 'master' into self 2019-09-20 16:06:33 +01:00
Heroman
f315f07205 Earlyports fixes to sandstone and adminwall 2019-09-20 13:27:58 +10:00
Rykka
f3654d1b79 Amends name of outfits 2019-09-19 20:58:10 -06:00
Repede
47e0a1b306 Techpriest stuff in fluff
Sprites are j a n k
2019-09-19 22:55:58 -04:00
Rykka
c9e6a417f3 Adds Waiter/Waitress 2019-09-19 20:45:13 -06:00
Heroman3003
ac3f9ea671 Makes threshold be based on specific organ rather than straight 10 2019-09-20 12:42:38 +10:00
Hawk-v3
0c102792c3 Merge branch 'master' into master 2019-09-19 23:00:15 +01:00
Trilbyspaceclone
076ca8c709 flagging it as YAWN code 2019-09-19 17:46:54 -04:00
Trilbyspaceclone
933d4de4ab Update mine_turfs.dm 2019-09-19 17:42:46 -04:00
Hawk_v3
9f7c9ac4bd Merge remote-tracking branch 'server/master' 2019-09-19 21:33:41 +01:00
Heroman
d82c986d0a Makes sushi require fish meat 2019-09-20 05:59:16 +10:00
Hawk-v3
9a750cbad5 Merge branch 'master' into patch-2 2019-09-19 20:14:57 +01:00
Hawk_v3
ac61a5cc37 Merge remote-tracking branch 'upstream/master' 2019-09-19 19:54:34 +01:00
Hawk-v3
8d2083405a Merge branch 'master' into patch-3 2019-09-19 19:51:48 +01:00
Hawk-v3
06ffc4a24c Merge branch 'master' into patch-2 2019-09-19 19:51:34 +01:00
Izac Joof Forsgren
c747a4f65f Revert "Makes digging sand 1.5 times as fast" 2019-09-19 18:18:21 +02:00
Izac Joof Forsgren
109d0eb7ce Merge branch 'master' into patch-4 2019-09-19 18:03:14 +02:00
Verkister
634bdcd3a5 Fixes mouse nutrition runtime spam.
No more dividing by zero every life tick while also letting the mice have a mouse-appropriate non-powergamey amount of nutrition to drain. (ps. it's not "infinite food", the bellymode is called "drain" for a reason)
2019-09-19 17:24:59 +03:00
Trilbyspaceclone
2c36ce3e21 30 2019-09-19 08:12:52 -04:00
TheFurryFeline
f1ba4aca5e Nom the Communicators!
Making a call with your friend? Want to give them a good view of what you can do to them? Here ya go~! Also includes commwatches by default since they're a child of the device/communicator. :3 Ports https://github.com/CHOMPstation/CHOMPstation/pull/798 because I rather like it. Would be interesting when used for scenes or tempting partners into a future scene.
2019-09-19 03:58:43 -04:00
Trilbyspaceclone
3c54fee611 Update mine_turfs.dm 2019-09-18 20:36:26 -04:00
Trilbyspaceclone
5d917f43f3 Update weapon.dm 2019-09-18 20:23:51 -04:00