Commit Graph

6085 Commits

Author SHA1 Message Date
Poojawa 209b195822 this probably doesn't fix the shitty console, but 2019-10-04 07:31:31 -05:00
Poojawa 0716b48a99 unmodularize it 2019-10-04 06:56:57 -05:00
Poojawa 6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa 27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05:00
Poojawa b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Arturlang 47037c1d57 Instakill-man-bad
OwO
2019-10-03 10:54:56 +03:00
Ghommie 6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
Seris02 eb3f26545d Merge pull request #3 from Citadel-Station-13/master
Updating my fork on a web browser, oof
2019-10-02 16:11:02 +08:00
kevinz000 08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
2019-10-02 00:06:13 -07:00
kevinz000 af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
2019-10-02 00:01:05 -07:00
Sishen fbaa8d355f Update dynamic.dm 2019-10-02 02:39:58 -04:00
Sishen f3d373a6b8 loose goose
honk honk
2019-10-02 02:27:30 -04:00
Sishen 0abcbe0fb5 Update suit_storage_unit.dm 2019-10-01 23:49:46 -04:00
Poojawa 0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
Sishen c9fb4cecbc Update neovgre.dm 2019-10-01 22:30:20 -04:00
Sishen ad7ea00627 Update neovgre.dm 2019-10-01 22:29:03 -04:00
Ghommie d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie 2a84162c59 incorrect number of macro arguments 2019-10-02 00:38:58 +02:00
Ghommie 81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Seris02 89277e6206 Merge pull request #2 from Citadel-Station-13/master
updating fork from browser
2019-10-01 22:11:14 +08:00
kevinz000 250c6ed986 Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Fermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa 117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
kappa-sama c42d5b31a1 ok justin 2019-09-30 20:13:31 -04:00
Fermi 2f0e5d8091 Hotfix 2019-09-29 21:27:42 +01:00
kevinz000 5c8471808c Update plastic.dm 2019-09-28 20:44:29 -07:00
Fermi f83de63124 Kev's scanner malarky 2019-09-28 17:51:55 +01:00
Seris02 82e10faccf Update cloning.dm 2019-09-28 20:27:33 +08:00
Poojawa 9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
Poojawa 30e6445c0a Suit Storage now purges radation contamination 2019-09-28 03:18:31 -05:00
Poojawa 041a4b4ed1 Corrects scanner measurment information 2019-09-28 03:18:00 -05:00
kevinz000 0febc1977a Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
kevinz000 d7d4e3cbe2 Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
kevinz000 cc64b8e0a4 Merge pull request #9320 from Ghommie/Ghommie-cit200
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-28 00:22:13 -07:00
kevinz000 3ce5b318ca Merge pull request #9317 from Ghommie/Ghommie-cit199
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
kevinz000 5562db4ed4 Merge pull request #8914 from Ghommie/Ghommie-cit147
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
Poojawa ad9af65e73 lazily hijack the med hud update 2019-09-28 02:10:30 -05:00
Raptorizer fe35a0d776 Projectiles increased to a proper number 2019-09-28 01:16:30 -05:00
Raptorizer 5607dff199 Update weapons.dm
Equalized the power of the melon seed.
2019-09-28 00:54:31 -05:00
Poojawa f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
Ghommie 225b196b55 sure, let's fix the typo. 2019-09-27 22:14:51 +02:00
Ghommie f820a95238 Fixing an issue with DNA scanners maintenance hatches. Also porting some sleepers code updates. 2019-09-27 22:01:23 +02:00
nik707 3f1f234686 Merge pull request #9170 from Trilbyspaceclone/more_cooking2
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
TrilbySpaceClone 41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
kevinz000 9270adba8a Merge pull request #9334 from Ghommie/Ghommie-cit204
Enables emojis for PDA messages.
2019-09-23 20:17:25 -07:00
kevinz000 039b2a03a0 Merge pull request #9332 from Ghommie/Ghommie-cit202
Prevents sofas being wielded and thus transformed into normal chairs.
2019-09-23 20:16:53 -07:00
kevinz000 a7e7fab301 Merge pull request #9331 from Ghommie/Ghommie-cit201
Fixing machinery's alt-click rotation.
2019-09-23 20:16:35 -07:00