Atermonera
ee32bfcf23
Merge pull request #6807 from Neerti/multiline_command_stuff
...
QoL: Comms Consoles
2020-03-11 02:10:40 -04:00
ZekeSulastin
84f161a6f2
Fixes pregame loop with no readied players ( #6814 )
...
When the config option for pregame time was added in #6795 , the
pregame_timeleft setting was moved out of the do while !setup loop.
If the game does not set up, it would keep decrementing the counter
into the negatives since it was never reset.
2020-03-11 01:36:01 -04:00
Unknown
ad836beff3
Buffs ERT Backpack
...
I always thought it strange that the ERT had both their own backpacks, and access to the unquestionably superior Syndicate dufflebags.
This buffs the ERT Backpack to be on par with the syndicate dufflebag. Long term plan is to remove the Syndicate dufflebags from the ERT Armory, but that cannot be done yet due to the mapping freeze.
2020-03-10 23:03:28 -04:00
Atermonera
e57c1a0e19
Merge pull request #6812 from PolarisSS13/more_buttons
...
Gives +MOD the traitor panel and colorable OOC.
2020-03-10 21:19:13 -04:00
Atermonera
d39b10b144
Merge pull request #6803 from Schnayy/CookingUpdate1
...
Cooking adjustments
2020-03-10 18:41:02 -04:00
Arokha Sieyes
202cdfe2e0
Fix modular computer icons
2020-03-10 11:29:59 -04:00
Novacat
848d102d92
Merge pull request #6792 from Novacat/nova-pathfinder
...
Mob bellytexts by Xander
2020-03-10 10:56:05 -04:00
Novacat
e37c0b854d
Merge pull request #6796 from VOREStation/upstream-merge-6797
...
[MIRROR] Fixed menthol cigarette runtime
2020-03-10 10:52:06 -04:00
Novacat
85fddfda9e
Merge pull request #6794 from VOREStation/upstream-merge-6798
...
[MIRROR] Ports Rollerbed Sprites from Vore
2020-03-10 10:51:53 -04:00
Unknown
be8c05f2c7
Removes redundancy
2020-03-10 10:10:33 -04:00
Novacat
53b19470ce
Update Chemistry-Reagents-Medicine.dm
2020-03-10 10:02:10 -04:00
Novacat
928373c33a
Merge pull request #6795 from VOREStation/upstream-merge-6796
...
[MIRROR] Oct-Feb News Update
2020-03-10 10:01:38 -04:00
Atermonera
942cc04433
Merge pull request #6800 from Cerebulon/spiderstomp
...
Allows Spiderlings to be Stomped
2020-03-10 03:46:29 -04:00
Atermonera
7d522fe449
Fixed menthol cigarette runtime
2020-03-10 03:41:06 -04:00
Atermonera
6bcb84b44a
Merge pull request #6796 from Cerebulon/newsUpdatemar2020
...
Oct-Feb News Update
2020-03-10 03:37:49 -04:00
Novacat
fb0ebd5627
Merge pull request #6784 from Verkister/bigbois
...
Some new voremob additions and tweaks
2020-03-09 19:37:18 -04:00
Unknown
313b5c4785
Fixes compile error
2020-03-09 17:26:47 -04:00
Unknown
8c358c98e8
Mob bellytexts by Xander
2020-03-09 17:22:52 -04:00
Novacat
cff8548396
Merge pull request #6791 from VOREStation/aro-proteanruntime
...
Fix two protean bugs
2020-03-09 16:08:10 -04:00
Aronai Sieyes
f5e3ec2e62
Make protean blobs get vore prefs
2020-03-09 15:44:01 -04:00
Unknown
cf6c91db88
Moves CC to Command dept for timeclock reasons
2020-03-09 15:42:06 -04:00
Unknown
b2cd0eade0
Converts off duty system to new system
2020-03-09 15:37:45 -04:00
Aronai Sieyes
b500fbdc5d
Fix a protean runtime
2020-03-09 15:35:39 -04:00
Unknown
cee18b54a6
More mrowls
2020-03-09 15:21:55 -04:00
Unknown
d23683c2f0
MROWL
2020-03-09 02:37:25 -04:00
Novacat
5be57ebb7a
Update datacore.dm
2020-03-09 01:57:54 -04:00
Novacat
342f964e33
Update datacore.dm
2020-03-09 01:56:51 -04:00
Novacat
ec12b68c25
Update jobs.dm
2020-03-09 01:49:00 -04:00
Novacat
0fe1097efc
Update card.dm
2020-03-09 01:48:06 -04:00
Novacat
2eae0fdecb
Merge branch 'master' into upstream-merge-6762
2020-03-09 01:45:23 -04:00
Novacat
70ce4a2797
Update world.dm
2020-03-09 01:31:07 -04:00
Novacat
f6b72c9997
Update subsystems.dm
2020-03-09 01:27:06 -04:00
Novacat
1b5fcc052c
Update misc.dm
2020-03-09 01:26:36 -04:00
Arokha Sieyes
32ccb0901a
Port Bay's inactivity subsystem
2020-03-09 00:53:31 -04:00
Aronai Sieyes
b849ff90a2
Merge pull request #6785 from VOREStation/aro-DELETEWHENMERGED
...
Fix missing incorporeal floatyness
2020-03-08 17:53:15 -04:00
Verkister
2459d25f86
realized phoron dragon didn't even have name
2020-03-08 22:32:35 +02:00
Atermonera
51d74bc25b
Merge pull request #6793 from Cerebulon/emlocksprite
...
Fixes shuttle emergency locker sprites
2020-03-08 16:22:34 -04:00
Aronai Sieyes
0500515a41
Fix missing incorporeal floatyness
2020-03-08 15:47:36 -04:00
Verkister
9074e42489
Some new voremob additions and tweaks
...
-Ports Chompstation phoron dragon (big, mountable)
-Adds direwolf (big, mountable)
-Adds chubby oties (regular, collar, security, all mountable)
-Fixes dragon mounting.
-Adjusts corrupthound, otie, and rat damages for post-AI-fix balance.
2020-03-08 21:40:37 +02:00
Novacat
6eb9b4faf6
Merge pull request #6780 from VOREStation/upstream-merge-6767
...
[MIRROR] Exosuit Expansion: Return of the Ripley
2020-03-08 12:31:50 -04:00
Novacat
3c06d62345
Update weldingtool.dm
2020-03-08 03:25:18 -04:00
Novacat
893ed0572d
Merge pull request #6779 from VOREStation/aro-pregameconf
...
Makes pregame time a config setting
2020-03-08 01:48:04 -05:00
Mechoid
acc712e1d5
Exosuit Expansion: Return of the Ripley
2020-03-08 00:52:32 -05:00
Aronai Sieyes
72f239b2ac
Makes pregame time a config setting
...
Boo hardcoded values
2020-03-08 01:05:28 -04:00
Novacat
c91a7a8e02
Merge pull request #6662 from VOREStation/SpadesNeil-patch-1
...
Attempts to fix Panslavic, again.
2020-03-07 14:48:22 -05:00
Spades
8526f8582c
Update station_vr.dm
2020-03-06 22:23:32 -05:00
Spades
04143d01a8
Update station_vr.dm
2020-03-06 19:32:10 -05:00
Aronai Sieyes
632d3a8dc5
Merge pull request #6773 from VOREStation/aro-blufo
...
Random stuff for map use/events
2020-03-06 13:14:37 -05:00
Arokha Sieyes
3f782d1ea2
Sprites 'n stuff
2020-03-06 13:03:53 -05:00
Aronai Sieyes
7e848e90fc
Merge pull request #6772 from VOREStation/aro-blufo
...
Various minor things
2020-03-06 09:58:00 -05:00
