111 Commits
Author SHA1 Message Date
FermiandFermi 37bfb31ee0 Merge branch 'master' into Superbases-goodbye 2019-11-01 00:55:55 +00:00
ThalpyandGitHub 642b27a10f Ghommie 2019-11-01 00:26:22 +00:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Thalpy 7ace15d846 oops 2019-10-21 20:58:15 +01:00
Thalpy 36357b3280 Eh this way is probably better. 2019-10-21 19:54:44 +01:00
Thalpy 805079b62c Goodbye, superpH, you were too wild for our world. 2019-10-21 19:44:52 +01:00
Poojawa 117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
FermiandFermi 3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
FermiandFermi bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
FermiandFermi 0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Poojawa 32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Thalpy 7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
Thalpy f8a93a035f Tweaking pH based on user feedback. 2019-06-29 07:32:00 +01:00
Fermi 3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
Fermi be36a8bb33 Cleanup 2019-06-15 18:04:06 +01:00
Fermi 79d176336c A few minor fixes. 2019-06-15 11:36:38 +01:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi aa1cb22edc Eigenstate fixes. 2019-06-14 16:26:08 +01:00
Fermi 2365f7337c Adventures in bitflags! 2019-06-14 12:47:22 +01:00
Fermi e95b371ea5 Changed to weakness 2019-06-14 11:56:28 +01:00
Fermi d6edc8db1f Preweakeness 2019-06-14 11:43:01 +01:00
Fermi ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi ee458b102f bitflags 2019-06-14 10:45:36 +01:00
Fermi 2a76cfa285 Logging 2019-06-13 07:51:46 +01:00
Fermi 54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi c9a66544bc pH and temp immune bitflagging. 2019-06-13 06:45:29 +01:00
Fermi aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi a6b211a4a3 Fixes for beakers. 2019-06-13 03:25:16 +01:00
Fermi 91e58d896e Spelling is hard. 2019-06-13 03:24:02 +01:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Thalpy 71eb285472 Few tweaks and fixes to last commits. 2019-05-29 20:04:52 +01:00
Thalpy 45149ffc11 Beaker resistance check moved. 2019-05-29 18:29:56 +01:00
Fermi b1c11071de Fixed acid to water and funbits. 2019-05-24 01:50:33 +01:00
Fermi 7cb7f5de73 Update of master required. 2019-05-22 16:50:53 +01:00
Fermi 2218956a09 Gearing up for PR 2019-05-15 05:27:09 +01:00
deathride58 a205177ff5 Reduces the pixel variance of thrown objects and tries to fix the bug where bartender glasses are rotated 2019-02-26 21:11:50 -05:00
deathride58andkevinz000 7db87db43a fancier throws, fancier bullet casings, fancier window destruction, fancier bottle smashing (#7997) 2019-02-13 21:02:00 -08:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBotandPoojawa e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297)
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
2018-02-05 04:42:13 -06:00
deathride58 aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJayandGitHub 39b016306c Update reagent_containers.dm 2017-12-19 17:17:54 -06:00
LetterJayandGitHub 1b9d60c604 Update reagent_containers.dm 2017-12-19 15:29:55 -06:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
ShizCalevandCitadelStationBot 831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00