Commit Graph
942 Commits
Author SHA1 Message Date
deathride58andGitHub 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
kevinz000andGitHub 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
kevinz000andGitHub 8be030a931 Merge pull request #9482 from Thalpy/Wiki
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Thalpy acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
deathride58andGitHub af39f679a7 Merge pull request #9489 from Ghommie/Ghommie-cit232
Ports slighty improved drink sprites
2019-10-15 06:17:39 -04:00
Thalpy 1b170fe2b7 Costume for meee 2019-10-15 10:27:31 +01:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Ghommie e65e11b2f6 Ports "drinksprites" 2019-10-14 00:25:38 +02:00
Thalpy 7b27d9bd24 Library time 2019-10-13 16:19:32 +01:00
FermiandFermi 29f7be9aca surgeri.dmi 2019-10-11 21:49:29 +01:00
kevinz000andGitHub b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
FermiandFermi f6e41db49f Travis??? 2019-10-11 19:20:20 +01:00
FermiandFermi cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
kevinz000andGitHub 3e6415d4b5 Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
2019-10-10 02:23:15 -07:00
kevinz000andGitHub fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
Thalpy 348f6a4db4 Fixes Icons 2019-10-10 07:36:44 +01:00
FermiandFermi c4ac815598 Oof 2019-10-09 16:35:20 +01:00
FermiandFermi b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00
FermiandFermi 146e0aae29 Crashes make me sad 2019-10-09 15:03:04 +01:00
FermiandFermi 1dce18962d Jaqc complete. 2019-10-09 11:58:36 +01:00
lolman360 04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
kevinz000andGitHub 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
kevinz000andGitHub 6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
2019-10-08 00:30:54 -07:00
kevinz000andGitHub 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
2019-10-08 00:28:06 -07:00
Ghommie 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02: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
kevinz000andGitHub 1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
FermiandFermi 4b6d996416 Merge branch 'master' into Blind-quirk-without-anger 2019-10-01 08:41:12 +01:00
FermiandFermi 13276d3d96 Tests 2019-10-01 07:35:59 +01:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
TrilbySpaceClone 3f893195bf tested! 2019-09-30 11:42:07 -04:00
FermiandFermi 3f7c657111 Plate and pH (pHlate) 2019-09-27 12:01:03 +01:00
FermiandFermi 146219edf9 Merge branch 'master' into beakerpH_tweaks 2019-09-27 11:50:31 +01:00
nik707andGitHub 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
FermiandFermi 00a46fe971 Missed a beaker 2019-09-22 03:03:33 +01:00
FermiandFermi f301a85cdd Bucket lip 2019-09-22 02:59:08 +01:00
FermiandFermi a48c881a8c Sprites. 2019-09-22 02:58:23 +01:00
FermiandFermi 0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Ghommie 293d0f02c9 Fixes clown shoes icon_state. 2019-09-21 22:06:40 +02:00
TrilbySpaceClone 45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
kevinz000andGitHub 5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000andGitHub f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
Linzolle 8bc8a0e440 fix shit 2019-09-20 18:25:36 -05:00
kevinz000andGitHub 9108c1ce89 Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
TrilbySpaceClone 5ecf68918b tada 2019-09-18 03:47:52 -04:00
Poojawa fbf92d6486 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 23:28:53 -05:00