Commit Graph

16697 Commits

Author SHA1 Message Date
Landerlow
78daffe4ae Adds sake to hacked booze dispenser 2017-10-27 18:36:59 +02:00
tigercat2000
12949e24f8 Merge pull request #8184 from Birdtalon/ticket-machine
Birdtickets: Adminhelp based ticket system
2017-10-27 09:24:06 -07:00
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
FalseIncarnate
58bfb314d0 compromise 2017-10-26 21:01:05 -04:00
tigercat2000
c0db96a1fb Merge pull request #8208 from Anasari/STAWPBREAKINTHELAWS
Change some phrases for brain damage and add some more
2017-10-26 17:50:38 -07:00
Ansari
b48105d1cd >my face 2017-10-27 08:31:24 +08:00
tigercat2000
9be3546996 Merge pull request #8294 from TDSSS/ERT-comms
Adds code for ERT to com channel list
2017-10-26 15:52:05 -07:00
tigercat2000
6d467aa9f1 Merge pull request #8289 from Kyep/freedom_operatives
Adds Freedom Operatives
2017-10-26 15:38:45 -07:00
Birdtalon
11e1bd2f5d requested changes 2017-10-26 22:04:51 +01:00
tigercat2000
1f71d87332 Merge pull request #8273 from Kyep/ert_orders
ERT Spawn Tweaks
2017-10-25 16:42:30 -07:00
Crazy Lemon
e1d7dbbfaf Merge pull request #8158 from tigercat2000/nano_ui_tiger_edition
NanoUI Update/Refactor/Buildscript Rewrite
2017-10-25 16:14:15 -07:00
Crazy Lemon
b31110c0e8 Merge pull request #8270 from Kyep/ert_slots
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
160ed56876 Merge pull request #8269 from Anasari/nosenseofhumour
Fix preference description
2017-10-25 14:49:06 -07:00
Crazy Lemon
11b597dffb Merge pull request #8266 from Kyep/perms_panel
Headmins get Loopy Permissions
2017-10-25 14:47:44 -07:00
TDSSS
c0026cbec0 Now using $ as symbol for ert channel 2017-10-23 14:48:51 +02:00
Ansari
c700aa38ed Change "my face". Add spessship to first phrase. 2017-10-23 07:20:53 +08:00
TDSSS
e83e8d581c Welp, o is in use as well. I think ! should be unused, though. I've checked all the places I can think of, but maybe I overlooked some. 2017-10-23 00:42:40 +02:00
TDSSS
bf157f7ac1 Changed letter from y to o, hopefully this one isn't used by any obscure admeme races 2017-10-22 21:29:51 +02:00
tigercat2000
df597ff2d0 Merge pull request #7851 from Aurorablade/EmotesAndShit
Emotes and shit
2017-10-22 12:08:02 -07:00
tigercat2000
77fb35c676 Fix spacing in mob.dm 2017-10-22 11:04:43 -07:00
tigercat2000
767634e7ac Merge pull request #7615 from Crazylemon64/no_suicide_clone
No more cloning suiciders
2017-10-22 10:48:30 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07:00
TDSSS
06751b59cb Adds code for ERT to com channel list 2017-10-22 16:42:04 +02:00
Kyep
26965d34b2 Adds Freedom Operatives 2017-10-21 04:10:53 -07:00
Kyep
063c2ff291 Dispatching closes panel 2017-10-20 21:36:42 -07:00
Kyep
faa6788b80 "var X" -> "var/x" 2017-10-19 08:28:31 -07:00
Kyep
83dcf5b68a Let gamma borgs have module choice 2017-10-18 18:59:37 -07:00
Kyep
629acbf36d Lets ghosts see what ERT positions are open 2017-10-18 03:04:42 -07:00
Kyep
42089d1820 Spaces 2017-10-18 02:49:34 -07:00
Kyep
3e2c510cf1 Spawn Tweaks 2017-10-18 02:41:43 -07:00
Kyep
04fec43a9c tweaks
- Removed duplicate boxes from janitor and paranormal ert loadouts
- Added telebaton to janitor loadout (they do have an all-access ID to
defend)
- Tweaked borgs to fix a runtime on spawn
- Clarified logging format
- Made panel look much nicer
- Added 2 and 4 slot options in panel
- Made no-slot positions display as '-' rather than '0'
2017-10-18 01:18:59 -07:00
Kyep
9b7def1f87 Initial version 2017-10-17 23:44:32 -07:00
Ansari
03fb4925f1 fix prefs 2017-10-18 12:02:37 +08:00
Kyep
5f66da051a Also tells you if you're toggling on/off 2017-10-16 22:20:48 -07:00
Kyep
168f6799db Tiger 2017-10-16 20:38:46 -07:00
Kyep
6f5160775b Permissions Panel Loop 2017-10-16 20:31:59 -07:00
tigercat2000
b141323e08 Merge pull request #7800 from Citinited/clipboard-improvements
Makes clipboard code less horrible
2017-10-15 19:40:57 -07:00
tigercat2000
6f0167b777 Merge pull request #7735 from Citinited/miscellaneous-fixes
In which I fix a bunch of issues and tweak some other things
2017-10-15 19:40:46 -07:00
Citinited
acc6aaa73a Tigercat formatting changes 2017-10-16 03:29:22 +01:00
Aurorablade
0aaaf3a11c THESE WOUNDS THEY WILL NOT HEAL 2017-10-15 22:26:34 -04:00
Aurorablade
b5c0d7d58d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EmotesAndShit 2017-10-15 21:15:01 -04:00
Aurorablade
8df384e45f Spin emote removal..
..But keeps the proc! CUASE ITS CLEAN!
2017-10-15 20:07:23 -04:00
TDSSS
1e7575afde Adjusted ghetto surgery tool chances to keep ghetto surgery chances overall roughly equal. Also added rigsuit removal to list of surgeries that don't care about pain. 2017-10-15 15:28:25 -07:00
TDSSS
897e201775 Started on surgery stuff
Adds pain modifier to surgery if patient is conscious

Now actually compiles

Makes surgery easier if patient is drunk, allowing for easier ghetto surgery.

Now reduces failure chance if painkillers are in the patient's system.

Fixed argument spacing (hopefully)

Repairing robotic limbs no longer needs anesthesia.

Revert "Repairing robotic limbs no longer needs anesthesia."

This reverts commit 12c1f4140a.

Repairing robotic limbs doesn't cause a pain modifier, because they don't feel pain. Now actually works.

Moves typecasting from the helper proc to outside fo it and checks for sleeping.

Now correctly checks for repair to robotic limbs.

Increased effectiveness of Hydrocodone and Morphine to 99% on maintainer recommendation.
2017-10-15 15:28:13 -07:00
Citinited
73d8c564fc tigercat formatting changes 2017-10-15 23:15:28 +01:00
Citinited
be97382c26 Tigercat & Fox tweaks 2017-10-15 23:03:28 +01:00
Citinited
cd5ba823f2 Shuttles will now only close airlocks when moving 2017-10-15 23:02:58 +01:00
Citinited
c3a31fe015 You can now remove facehuggers from corgis 2017-10-15 23:02:58 +01:00
tigercat2000
5e7a9a6470 Merge pull request #7904 from FlattestGuitar/guardian-memes
Holoparasites. Take two.
2017-10-15 14:48:20 -07:00
tigercat2000
fd02035b47 Merge pull request #8044 from Kyep/sec_status_execute
Adds 'Execute' status, sec status change logging
2017-10-15 14:42:48 -07:00