Commit Graph

17533 Commits

Author SHA1 Message Date
oranges
388324feff Merge pull request #20171 from Cruix/protolathe_stuff
Fixed rdconsole search function not showing required reagents.
2016-08-29 21:01:32 +12:00
oranges
c11b9509d2 Merge pull request #20160 from ChangelingRain/goandlovemegoandhatemegoandcrybutyoucantchangeme
Simple animals with force thresholds now properly handle damage_coeff
2016-08-29 21:00:42 +12:00
AnturK
6c63593be6 Merge pull request #20091 from Cruix/bigger_disks
Added technology and design disks that can hold more than one entry.
2016-08-29 09:47:13 +02:00
oranges
ef84942384 Merge pull request #20082 from Xhuis/highlander_patch
[s] Highlander 2.0
2016-08-29 11:27:58 +12:00
unknown
87386dae37 Fixed rdconsole search function not showing required reagents. 2016-08-27 21:52:38 -07:00
Core0verload
ef8cb75bea Removes duplicate ..() (#20167) 2016-08-27 23:01:44 -05:00
Xhuis
aa6d24d4a3 Removes nodrop from claymores 2016-08-27 22:23:58 -04:00
Xhuis
ae841585b3 Removes some unneeded features, adds a coward-compass 2016-08-27 22:20:02 -04:00
Cheridan
7deb370521 FUCK POCKETS (#20129) 2016-08-28 13:06:37 +12:00
oranges
26e833b530 Merge pull request #20114 from KorPhaeron/wizard
New Wizard Armour
2016-08-28 13:00:12 +12:00
oranges
3badbcc9ec Merge pull request #20115 from Shadowlight213/whydoestheaihavetogointhecoreitcouldgoonthetable
A few tweaks and improvements to silicons.
2016-08-28 12:58:15 +12:00
oranges
b5903be779 Merge pull request #20136 from ChangelingRain/asinglewhisperedtruthcanbreakchainsbreakalliesforgefriendsintoenemiesandenemiesintofriends
Being in front of the particle accelerator is now actually dangerous
2016-08-28 12:44:17 +12:00
oranges
f800987765 Merge pull request #20083 from PKPenguin321/explosive-tesla
[READY] Explosive Tesla, Take 2
2016-08-28 12:42:22 +12:00
oranges
0c95041d5b Merge pull request #20106 from Shadowlight213/interactfixes
Tweaks to admin ai interact
2016-08-28 12:38:39 +12:00
oranges
5aa96750b9 Merge pull request #20102 from Shadowlight213/retryingin30secondsretryingin30secondsretryingin30seconds
Fixes the ghost role spawn infinite loop.
2016-08-28 12:38:25 +12:00
oranges
251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes
More Mining Base Tweaks
2016-08-28 12:38:12 +12:00
oranges
ced523874c Merge pull request #20099 from ChangelingRain/ayesgivenlikeitsallsomeonecansaylikeitstheonlyoptionisjustasbadasgoingonwhentheysayno
The staff of lava can now turn lava back into basalt
2016-08-28 12:37:14 +12:00
Incoming5643
09683bac79 adds the gender change potion as the blood reaction of pink slimes (pink slimes previously only had one reaction, and it's not exactly a barnburner). (#20149)
This item changes up the gender var of any gendered mob/living. Including people. There are a few interesting applications of this item, mostly if your into animal husbandry (all generic animals unless programed otherwise are all the same gender) but mostly it's just here to fill the immensely niche gap the loss of gender reassignment surgery left. Also it's 2:30 am.

Also factors out the old human var gender_ambiguous, as that surgery was the only way to ever trigger it.
2016-08-27 19:29:20 -05:00
Joan Lung
8637607c5e Simple animals with force thresholds now properly handle damage_coeff 2016-08-27 18:53:18 -04:00
PKPenguin321
a8f893d343 fixes runtime with grav gen 2016-08-27 15:38:44 -07:00
PKPenguin321
58f43daee3 makes nuke and grav gen properly destroy when zapped 2016-08-27 15:20:25 -07:00
pubby
6f11a12e13 Replaces standard borg sheet snatcher with mining scanner. (#20111) 2016-08-27 16:56:28 -05:00
Incoming5643
424d450dbc Makes the "nothing happened!" option of drake's blood vaguely more entertaining/frustrating (#20144)
* Makes the "nothing happened!" option of drake's blood vaguely more entertaining by turning those who hit it into a lizardperson approximating the appearance of an ash drake.

* changed the colors to a suggestion of @ChangelingRain
2016-08-27 16:55:59 -05:00
Core0verload
3b188fd41f One Liner Fix (#20098) 2016-08-27 10:34:22 -05:00
KorPhaeron
03a2f10870 Fixes recharge rate 2016-08-27 00:45:12 -05:00
KorPhaeron
889b2380e8 Fixes wizard helmet icon getting messed up 2016-08-27 00:43:04 -05:00
Iamgoofball
f04ccfddea [s] I give up and rename it to what it actually does (#20148)
* [s] stops bans

* My Immortal, the entire Baneposting script, Bee Movie, Inside Out script, and then WGW for good measure in a commit message
2016-08-27 00:32:20 -05:00
Jordie
f9c3492e6e Merge pull request #20103 from Shadowlight213/radstormfixes
A couple of radstorm fixes.
2016-08-27 13:47:49 +10:00
Shadowlight213
1765e66e89 abort and refund 2016-08-26 18:18:11 -07:00
Shadowlight213
e54b42b3b9 Increases total attempts to 3.
Doubles the wait time between each attempt
2016-08-26 13:40:25 -07:00
Joan Lung
8015693e14 Being in front of the particle accelerator is now actually dangerous 2016-08-26 15:29:54 -04:00
Joan Lung
61cd5ab291 Merge pull request #20096 from Jalleo/Processor
Resolves the code for food processors and slime processors + minor fixes
2016-08-26 10:18:50 -04:00
blah
9471623237 Does the change that Joan requested 2016-08-26 15:11:14 +01:00
Kyle Spier-Swenson
26f293a296 [s]fixes qdel lag from computers in chasms (#20127)
* fixes qdel lag from computers in chasms

* Update computer.dm
2016-08-26 18:59:43 +12:00
Shadowlight213
3ff6886189 Fixes infinite stun and collapse spam 2016-08-25 21:58:23 -07:00
Leo
17ecd06950 Changes the ash drake armour on crafting recipe to match the actual item (#20122) 2016-08-25 23:56:32 -05:00
Supermichael777
2c37920f60 Adds a discription for triple citrus (#20090)
* Adds a discription for triple citrus

along with a placeholder sprite

* Add files via upload

* Add files via upload

* need to replace

* with thiss

* and implment
2016-08-26 14:13:25 +12:00
Joan Lung
52ba13fbdf Remove xenobio's free antag (#20081) 2016-08-26 14:12:29 +12:00
PKPenguin321
11a500d3b7 makes people get hurt when thrown at each other (#20084)
* makes people get hurt when thrown at each other

* why the space indeed
2016-08-26 14:12:06 +12:00
Joan Lung
5188bc7a69 Fixes AI bumping (#20077) 2016-08-26 14:11:20 +12:00
Xhuis
875a1551da Adjustments based on feedback 2016-08-25 20:24:47 -04:00
Shadowlight213
04e38f424a Fixes temp gun not starting with a pin (#20094) 2016-08-25 19:06:46 -05:00
ma44
420f83f14d Update hydroitemdefines.dm (#20101) 2016-08-25 18:26:38 -05:00
Shadowlight213
01f2343b41 A bunch of tweaks and improvements to silicons 2016-08-25 15:47:42 -07:00
KorPhaeron
6d2ab983fd New Wizard Armour 2016-08-25 17:32:16 -05:00
KorPhaeron
459ab8d949 Mapping object to help set baseturfs (#19962)
* Mapping Helper

* Minor fix
2016-08-26 09:01:12 +12:00
kilkun
d65ef9100f Minor modernization of nanotrasen death commandos (#20057)
* First round of deathsquad related changes

* fixes directory error for shielded hardsuit helmet
2016-08-26 08:50:16 +12:00
oranges
722cd0fc44 Merge pull request #20065 from Shadowlight213/ircsay
Adds adds the ability to get a list of admins and their status from irc.
2016-08-26 08:49:50 +12:00
Incoming5643
1993b8d7ca [s] Adds the top secret room to centcom (#20071)
* Adds the top secret room to centcom, the final destination of players who manage to cosign themselves to nullspace.

Said room is an homage to a room that served a similar purpose in the legend of zelda.

* Follow up issues pull:
for loop optimization
game logging
spelling errors

* more info for admin message
2016-08-26 08:46:52 +12:00
Core0verload
463e86af39 Revert "Removes the NULL Crate" (#20076) 2016-08-26 08:45:31 +12:00