tigercat2000
|
64c3bd0eb0
|
Merge pull request #8754 from IK3I/SubversionOfTheSubverted
When you're not in the mood...
|
2018-04-01 20:38:21 -07:00 |
|
IK3I
|
1350dfa0c2
|
Updates wording
|
2018-04-01 22:30:50 -05:00 |
|
tigercat2000
|
f05aac5715
|
Merge pull request #8658 from Tayyyyyyy/borg_qol
Borg QOD improvements
|
2018-04-01 19:56:39 -07:00 |
|
tigercat2000
|
f6dad122ba
|
Merge pull request #8357 from Aurorablade/VirusNostolgia
Wherein Fethas proves to be evil incarnate
|
2018-04-01 19:22:31 -07:00 |
|
tigercat2000
|
0f4c25f91c
|
Merge pull request #8528 from Tayyyyyyy/robot_talk
Make robot talk easier to read
|
2018-04-01 18:52:27 -07:00 |
|
tigercat2000
|
aa8038c4e7
|
Merge pull request #8616 from Tayyyyyyy/shuttle_cheese
Reduce shuttle cheese
|
2018-04-01 18:48:31 -07:00 |
|
tigercat2000
|
e67ba4ecd8
|
Merge pull request #8503 from Kyep/frikin_laser_beams
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
|
2018-04-01 18:47:31 -07:00 |
|
Fox McCloud
|
a94ffdb49f
|
Merge pull request #8790 from matt81093/inf_fish_fix
Fixes infi fish issue
|
2018-03-29 23:55:04 -04:00 |
|
Fox McCloud
|
a7bab46b3b
|
Removes Stat Throttle
|
2018-03-28 15:50:58 -04:00 |
|
Fox McCloud
|
067f5cf8e8
|
Merge pull request #8717 from GunDOSMk1/Norstead's-Fluff
Norstead's fluff : Soviet Casual Uniform
|
2018-03-28 15:41:18 -04:00 |
|
Fox McCloud
|
5701ea7c75
|
Ports Nano UI to Subsystems
|
2018-03-26 23:59:52 -04:00 |
|
tigercat2000
|
c13ce9099f
|
Merge pull request #8810 from Fox-McCloud/sun-subsystem
Ports Sun Controller to Subsystem
|
2018-03-26 15:21:02 -07:00 |
|
tigercat2000
|
931068c261
|
Merge pull request #8818 from Birdtalon/bluespace-cheese
Stops bluespace Cheese cheese
|
2018-03-26 14:11:00 -07:00 |
|
Birdtalon
|
941b8c2389
|
recursive checking for putting objects inside slicable foods
|
2018-03-26 20:19:11 +01:00 |
|
Fox McCloud
|
2b6a6eb812
|
Ports Sun Controller to Subsystem
|
2018-03-25 19:23:26 -04:00 |
|
Matthew Kelley
|
589c2d17a1
|
= is not == FailFish
|
2018-03-25 01:38:27 -05:00 |
|
Matthew Kelley
|
3b37884a71
|
Should fix infi fish issue
|
2018-03-25 01:38:27 -05:00 |
|
shazbot194
|
4b03a9abba
|
Second fix part 1
|
2018-03-24 16:41:14 -08:00 |
|
tigercat2000
|
e6cc32d1b6
|
Merge pull request #8803 from shazbot194/More_Jackets
Updates Patch's Jacket icons and adds some more colors
|
2018-03-23 19:56:28 -07:00 |
|
shazbot194
|
a3183ee485
|
Upadates Patch's Jacket icons and adds some more colors
|
2018-03-23 17:42:59 -08:00 |
|
tigercat2000
|
c4449fea39
|
Whoops
|
2018-03-22 15:41:33 -07:00 |
|
tigercat2000
|
47f1e2c1e4
|
Address Fox's concerns
|
2018-03-22 15:39:41 -07:00 |
|
tigercat2000
|
b14faa19c3
|
Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
# code/__DEFINES/flags.dm
|
2018-03-22 15:35:12 -07:00 |
|
tigercat2000
|
b1278de3d2
|
Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
|
2018-03-22 11:55:53 -07:00 |
|
IK3I
|
e635f7cbf3
|
Antag Toggle now appears only after antags are chosen in preferences.
|
2018-03-21 18:43:52 -05:00 |
|
shazbot194
|
3b1783fe66
|
Second merge fix part one
|
2018-03-20 21:16:20 -08:00 |
|
tigercat2000
|
d88a17a0f4
|
Fix runtimes, remove world init BS, UpdateTickRate()
|
2018-03-20 18:32:45 -07:00 |
|
Mars
|
8be770ed5d
|
Icon is named pill, not pills
|
2018-03-20 18:19:45 +01:00 |
|
Fox McCloud
|
53bb5eaf35
|
Vulp Hunger Hotfix
|
2018-03-19 19:37:35 -04:00 |
|
tigercat2000
|
50f9d695a5
|
Merge pull request #8124 from Aurorablade/Dreams
Byond the wall of sleep
|
2018-03-19 13:42:00 -07:00 |
|
tigercat2000
|
5a756ad3c9
|
Merge pull request #8708 from Birdtalon/nanocalcium
Nanocalcium: Bone repair drug.
|
2018-03-19 13:37:20 -07:00 |
|
tigercat2000
|
6f5a666b1a
|
Merge pull request #8284 from Aurorablade/CultPassBug
Cult pass split: Bugs and runes
|
2018-03-19 13:28:36 -07:00 |
|
shazbot194
|
0a9a3c2b2b
|
More icons for the M90 (#8738)
|
2018-03-19 13:20:31 -07:00 |
|
tigercat2000
|
de46e81793
|
Merge pull request #8775 from Birdtalon/take
Re-adds "Take" shortcut into admin help
|
2018-03-19 11:29:09 -07:00 |
|
tigercat2000
|
cd6b8dfe45
|
Merge pull request #8566 from Aurorablade/BuffsVulpkanin
Tips the Scales
|
2018-03-19 11:27:35 -07:00 |
|
Birdtalon
|
f7d96d8cfe
|
re-adds take shortcut into adminhelp
|
2018-03-19 11:27:21 +00:00 |
|
Aurorablade
|
2e74bcd4d5
|
Why this no commit?
|
2018-03-19 02:05:37 -04:00 |
|
Aurorablade
|
6aec682631
|
Diona needing water revert
Still have hair.
|
2018-03-19 02:05:16 -04:00 |
|
Aurorablade
|
737a1575ff
|
NYAH
|
2018-03-19 01:44:48 -04:00 |
|
Aurorablade
|
13212ee27c
|
Style Tweaks
|
2018-03-18 23:44:38 -04:00 |
|
Aurorablade
|
59cbd79cc3
|
Fine, no typo
|
2018-03-13 22:31:27 -04:00 |
|
Aurorablade
|
2a3dd305a9
|
Obscure Admin Related fixes
|
2018-03-13 22:22:51 -04:00 |
|
tigercat2000
|
4a01ed097d
|
Merge pull request #8750 from PigeonLord/food
I changed the taste description of a few food items
|
2018-03-13 04:56:42 -07:00 |
|
IK3I
|
404150ba8f
|
For the sake of clarity
|
2018-03-13 00:45:26 -05:00 |
|
Terilia
|
28806f8fd5
|
Merge remote-tracking branch 'upstream/master' into terifluff
|
2018-03-13 05:20:20 +00:00 |
|
Terilia
|
ae88de8669
|
Trying to solve the merge conflicts.
|
2018-03-13 04:50:25 +00:00 |
|
Fox McCloud
|
96fc4aba1c
|
Merge pull request #8671 from Aurorablade/PodFluff
Fluff Item: Decemviri
|
2018-03-12 15:58:39 -04:00 |
|
IK3I
|
da0e7b595a
|
Adds a preround antag roll toggle
|
2018-03-11 19:41:21 -05:00 |
|
Piccione
|
06fa27ac28
|
I changed the taste description of a few food items
|
2018-03-10 21:48:55 +01:00 |
|
tigercat2000
|
fce0f75eb1
|
Merge pull request #8741 from shazbot194/Desolate_Fluff
Desolate's fluff name fix, no longer dancing fluff item
|
2018-03-07 22:47:49 -08:00 |
|