Commit Graph

4508 Commits

Author SHA1 Message Date
Poojawa 105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
Trilbyspaceclone 3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
Trilbyspaceclone a9aa855305 Update recharger.dm 2019-04-28 21:25:18 -04:00
Trilbyspaceclone 8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
Trilbyspaceclone 59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04:00
kevinz000 fd7c5a9568 Merge pull request #8279 from Trilbyspaceclone/patch-107
Fixes deathriplys armor being halfed
2019-04-25 04:34:09 -07:00
Trilbyspaceclone 823dd1a98a Update ripley.dm 2019-04-23 04:40:21 -04:00
kevinz000 64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000 f05b326f15 Merge pull request #8250 from Trilbyspaceclone/patch-100
[Fix] Lowers pda sounds as well as make them respect ringer off
2019-04-22 21:31:38 -07:00
Poojawa 6698d9646b go away Travis 2019-04-17 06:32:42 -05:00
Poojawa 773a94dea6 I really dunno at this point, weh 2019-04-17 06:28:07 -05:00
Poojawa c65e551c07 makes travis shutup 2019-04-17 06:01:59 -05:00
Poojawa a0b7c15e0d whatever Travis, it isn't even enabled, fuck off 2019-04-17 04:52:39 -05:00
Poojawa fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa 73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Trilbyspaceclone ed608ac32c Bhijn... 2019-04-16 20:26:24 -04:00
Trilbyspaceclone df880c6723 Update PDA.dm 2019-04-16 16:07:52 -04:00
Trilbyspaceclone 1b970e7ce0 Update PDA.dm 2019-04-16 15:08:45 -04:00
Trilbyspaceclone 2b57db57ab Update PDA.dm 2019-04-16 15:07:51 -04:00
Poojawa f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -05:00
Poojawa a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Trilbyspaceclone 5c0c8aa4c9 Update PDA.dm 2019-04-15 23:43:36 -04:00
Poojawa f767069dc2 Custom Species names 2019-04-15 13:50:21 -05:00
Poojawa 12d17f6f52 usr 2019-04-15 11:28:42 -05:00
Poojawa 25d77bac91 Adds a can_inject check to IV Drips
Syringes and hyposprays check, so too do IV needles.
2019-04-15 01:01:16 -05:00
Poojawa 33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa 5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
kevinz000 637b92a88a Merge pull request #8228 from Coolgat3/ripley
Making the Ripley mech not useless (More info inside)
2019-04-13 00:22:10 -07:00
Poojawa 3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05:00
Cyprian 5434c20781 Changing the ripley 2019-04-09 17:09:07 +02:00
kevinz000 8eb8cafa2a Merge pull request #8195 from deathride58/clickdragitems
Adds the ability to quickly use an unequipped item on something by click-dragging it with an empty hand
2019-04-07 15:13:16 -07:00
kevinz000 1c297c186e Merge pull request #8219 from Coolgat3/berets
Berettide!
2019-04-07 14:49:24 -07:00
Poojawa 03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
kevinz000 26c68e70d1 Merge pull request #8158 from Trilbyspaceclone/patch-86
Makes Suit miner vouchers buyable and a Miner replacement bag
2019-04-06 19:17:01 -07:00
kevinz000 b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Poojawa 60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Cyprian 81fde9c7a6 Forgot to add the CE beret to the CE locker. 2019-04-06 23:34:10 +02:00
Cyprian 644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Poojawa d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone 9ab2bf3860 + <-- BAD 2019-04-04 16:28:18 -04:00
Trilbyspaceclone 003dd6d93d + is bad I guess 2019-04-04 15:53:36 -04:00
Trilbyspaceclone f92ba3714d Grammar fix 2019-04-04 13:58:21 -04:00
Trilbyspaceclone 76c952cd6f Update firstaid.dm 2019-04-04 13:57:15 -04:00
kevinz000 2eefef2681 Merge pull request #8196 from deathride58/definetimeprocs
Attempts to improve the performance of /mob/Stat() by turning various time procs into defines
2019-04-03 23:46:02 -07:00
kevinz000 997e975e1d Merge pull request #8170 from Trilbyspaceclone/Borgo
Maybe adds adv health scanner to all borgs that have health scanners
2019-04-02 05:37:22 -07:00
kevinz000 ebdd1ecce5 Merge pull request #8173 from Trilbyspaceclone/2.0Defibs
Defib upgrade tech
2019-04-02 05:35:04 -07:00
kevinz000 fc7e67ebcb Merge pull request #8183 from Seris02/master
adds bluespace bio bags
2019-04-02 05:34:27 -07:00