b66c700a63
tigercat & falseincarnate code suggestions
2018-04-14 16:40:25 +01:00
e352741f2b
Keeps old fortune cookie behaviour if a non-blank paper is used in the recipe
2018-04-14 14:17:06 +01:00
1c8740ca93
Merge branch 'master' into put-that-cookie-down
2018-04-14 01:21:24 +01:00
b60eb67202
Adds fortunes to fortune cookies
2018-04-14 01:06:11 +01:00
19f684d1b7
Allows paper to have variably-sized window
2018-04-14 00:43:40 +01:00
bee011cb05
Merge pull request #8789 from MarsM0nd/manned_up
...
Man up changes
2018-04-13 15:43:14 -07:00
fe7991da68
Revert man up message change
2018-04-13 13:27:26 +02:00
cf351543ce
Removes Job Restriction from Purely Cosmetic and Rarely Used Veils
...
Roboticist wasn't even spelled correctly. No idea if there were any other typos.
2018-04-09 03:00:27 -04:00
b659a1d9a1
Merge pull request #8678 from Kyep/ts_tunneler
...
Terror Spider Update, Brown Terrors
2018-04-08 01:38:34 -04:00
196d0b90f9
Makes Records GC (most of the time)
2018-04-07 23:38:10 -04:00
4f3fa5c11c
Tiger requests
2018-04-07 13:50:23 -07:00
f60fbf9cef
Merge pull request #8573 from uraniummeltdown/drone
...
Makes Drones A Small Mob
2018-04-06 21:21:50 -07:00
6743a6136c
Merge pull request #8777 from MarsM0nd/admin_fax
...
Fax machine changes
2018-04-06 20:33:07 -07:00
a1c2da04fe
Merge pull request #8705 from Birdtalon/ether
...
Re balances ether into a better anaesthetic
2018-04-06 20:21:04 -07:00
367ed46b79
Merge pull request #8618 from Kyep/xeno_window
...
Deletes Xenobio SIT docking port
2018-04-06 20:13:37 -07:00
86f89382c4
Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf
...
Nerfs loot-pinata-ing of hotel guards
2018-04-06 20:07:30 -07:00
57a4be2138
Merge pull request #8794 from Birdtalon/fixes
...
Fixes and tweaks
2018-04-06 20:02:07 -07:00
413832ee27
Merge pull request #8837 from Kyep/better_demotions
...
Better ID computer logging
2018-04-06 20:01:38 -07:00
af7abe2679
Makes Stacks Garbage Collect
2018-04-06 19:32:08 -04:00
639c40d140
Merge pull request #8824 from Fox-McCloud/gc-ss-port
...
Ports TG's Garbage Subsystem
2018-04-05 20:49:04 -07:00
9901fa4154
tweaks
2018-04-05 23:36:34 -04:00
f7521320a0
fixes the runtimes
2018-04-04 19:14:22 -04:00
e5ded5dba9
fixes typo
2018-04-04 11:11:27 -04:00
29a59cc06d
modular computer/software destroy fix
2018-04-04 07:04:23 -04:00
1d80bf01c0
Merge remote-tracking branch 'upstream/master' into gc-ss-port
...
# Conflicts:
# paradise.dme
2018-04-03 18:21:04 -04:00
b61766fbc5
Merge pull request #8812 from tigercat2000/night_shift
...
Nightshifts & Randomized Station Time
2018-04-03 18:09:09 -04:00
051e7755d8
darn modular computers
2018-04-03 01:27:22 -07:00
8fae4e380f
Merge pull request #8840 from Fox-McCloud/spacevine-fix
...
Fixes Unkillable Spacevines
2018-04-02 21:16:29 -07:00
c22025abfa
Fixes Unkillable Spacevines
2018-04-03 00:08:56 -04:00
8e5a42a7a1
Merge remote-tracking branch 'upstream/master' into night_shift
...
# Conflicts:
# code/world.dm
2018-04-02 17:24:36 -07:00
d07ef9a1ec
Merge pull request #8793 from DesolateG/Cricketborg
...
Adds Cricket Borgs to appearance selection for Cyborgs.
2018-04-01 23:46:03 -07:00
002684fa5d
Hotel space guards now fight back more meaningfully
...
and now dust on death to prevent loot pinata-ing
2018-04-01 22:26:32 -07:00
322dc17154
deletes from shuttle controller, squash
2018-04-01 21:59:12 -07:00
43671698cd
Merge pull request #8490 from Kyep/pet_tweaks
...
Station Pet Tweaks
2018-04-01 21:53:51 -07:00
39e0612683
deletes pushing changes
2018-04-01 21:43:24 -07:00
2c02c7bbc0
Removes pulling changes
2018-04-01 21:29:28 -07:00
d883b962df
Merge pull request #8826 from EldritchSigma/patch-1
...
Fixes Mech Disablers being not printable half the time
2018-04-01 21:21:29 -07:00
27dceb6131
Merge pull request #8613 from shazbot194/E-pistols
...
Adds in energy pistols
2018-04-01 20:42:42 -07:00
64c3bd0eb0
Merge pull request #8754 from IK3I/SubversionOfTheSubverted
...
When you're not in the mood...
2018-04-01 20:38:21 -07:00
1350dfa0c2
Updates wording
2018-04-01 22:30:50 -05:00
adcf2dcada
Merge fix
2018-04-01 19:17:48 -08:00
f05aac5715
Merge pull request #8658 from Tayyyyyyy/borg_qol
...
Borg QOD improvements
2018-04-01 19:56:39 -07:00
f6dad122ba
Merge pull request #8357 from Aurorablade/VirusNostolgia
...
Wherein Fethas proves to be evil incarnate
2018-04-01 19:22:31 -07:00
0f4c25f91c
Merge pull request #8528 from Tayyyyyyy/robot_talk
...
Make robot talk easier to read
2018-04-01 18:52:27 -07:00
aa8038c4e7
Merge pull request #8616 from Tayyyyyyy/shuttle_cheese
...
Reduce shuttle cheese
2018-04-01 18:48:31 -07:00
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
15d30b457e
Fixes Mech Disablers being not printable half the time
...
Apparently the Firedart and Mech-Disabler have the same ID for some bizarre reason. This PR fixes it. Its a minor fix and my first PR. Its basicly just changing one line to fix this pretty decent mech weapon to make it printable like it is every now and then.
Cause its weird that you can print it from round to round, but most of the time you can only print the stupid firedart.
2018-03-30 19:20:51 +02:00
e71c4279a7
Merge remote-tracking branch 'upstream/master' into night_shift
...
# Conflicts:
# paradise.dme
2018-03-30 10:20:21 -07:00
a94ffdb49f
Merge pull request #8790 from matt81093/inf_fish_fix
...
Fixes infi fish issue
2018-03-29 23:55:04 -04:00
8930946f69
increases delay before queen auto-nests, to give players more chance to catch an un-nested queen
2018-03-29 20:16:29 -07:00
Citinited