Commit Graph

2401 Commits

Author SHA1 Message Date
Poojawa 7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
2019-05-09 08:17:18 -05:00
Poojawa 5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Poojawa 5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
kevinz000 a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
Poojawa 69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05:00
deathride58 a3317ffe89 Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43
ASIMOV: human being --> "person of a NT approved crew species"
2019-05-07 02:19:28 -04:00
deathride58 8abd98cec7 Merge pull request #8162 from Trilbyspaceclone/patch-87
[Ready] Makes Cursed Katana's be Cursed once more
2019-05-06 19:24:38 -04:00
Trilbyspaceclone fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
Poojawa 996662ebea adjust and reset things 2019-05-06 04:35:09 -05:00
Poojawa 105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
Trilbyspaceclone 7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone 642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
kevinz000 5c54bacddb Update AI_modules.dm 2019-04-23 16:02:47 -07:00
kevinz000 776b0fad4b Update AI_modules.dm 2019-04-23 15:59:29 -07:00
kevinz000 64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
Poojawa 6698d9646b go away Travis 2019-04-17 06:32:42 -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 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 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
Poojawa 3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05: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