Alffd
a2e9258b7b
Atmos Fix
2017-11-11 00:10:21 -05:00
Aurorablade
36e0e8832a
F
2017-11-05 21:43:50 -05:00
FalseIncarnate
66f10657bd
fix merge conflicts (again)
2017-11-04 17:37:30 -04:00
Ansari
266a96a23c
remove redundant you
2017-11-02 11:23:55 +08:00
Crazy Lemon
8ad740ffd4
Merge pull request #8321 from Kyep/fix_freedom_suit
...
Fixes Freedom Op suits going red when toggled
2017-11-01 09:57:09 -07:00
tigercat2000
2ba2bcbfb1
Merge pull request #8298 from Allfd/ionfix
...
Ion Rifles are not pistols
2017-10-29 11:14:54 -07:00
FalseIncarnate
c1e1dc22d8
merge conflict fix
2017-10-28 18:38:20 -04:00
tigercat2000
138b376796
Merge pull request #8319 from Landerlow/sake
...
Adds sake to hacked booze dispenser
2017-10-28 14:19:06 -07:00
tigercat2000
d7770cdb56
Merge pull request #8309 from Squirgenheimer/typofix
...
Fixes small typo for energy crossbow design datum
2017-10-28 13:52:43 -07:00
tigercat2000
317067b7cf
Merge pull request #8301 from Kyep/ghost_hud
...
Improves Ghost HUDs
2017-10-28 13:50:14 -07:00
Crazy Lemon
4c48d24967
Merge pull request #7776 from tigercat2000/radio_comms_fluff
...
Air Traffic Control & Map Lore
2017-10-28 12:42:56 -07:00
Kyep
96beb024fa
Fixes Freedom Op suits going red when toggled
2017-10-28 00:21:26 -07:00
Birdtalon
f6708a200b
disables my tickets and fixes open ticket panel
2017-10-27 19:26:10 +01:00
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
2e01b435cc
Metastation is named, finally! NSS Cerebron. Also tweaks the delays.
2017-10-26 12:10:29 -07:00
tigercat2000
8a588d3aad
Merge remote-tracking branch 'upstream/master' into radio_comms_fluff
2017-10-26 12:02:31 -07: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
Squirgenheimer
66b7b26b21
Fixes typo for energy crossbow
2017-10-25 10:10:43 -04:00
Kyep
e3bdc978c5
Improves ghost HUDs
2017-10-24 00:27:16 -07:00
Alffd
e72d2852c2
Ion Rifles are not pistols
2017-10-23 19:00:12 -04: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
