Commit Graph
622 Commits
Author SHA1 Message Date
QuoteFox cb561ff456 fix for plushie reward 2020-03-03 13:16:25 +00:00
QuoteFox c3ded872f9 Patreon Reward: Heliocintrini
Patreon plush for Heliocintrini
2020-03-03 00:53:25 +00:00
QuoteFox 3e2219bad1 Patreon Reward: winterbloo
Plushie added to his loadout, for a patreon reward!
2020-03-02 17:29:43 +00:00
DahlularandGitHub 3925ca599e Merge pull request #217 from jbox144/patch-8
Tania plushie and code refactor
2020-03-01 16:33:22 -07:00
jbox1andGitHub 7d2fc218f1 Update plushes.dm 2020-02-28 17:15:34 +11:00
jbox1andGitHub 13863b3cd6 Update plushes.dm 2020-02-28 17:14:36 +11:00
DahlularandGitHub a97713b799 Merge pull request #212 from SynnGraffkin/Better-box
More Box Improvements and Cleanup
2020-02-27 06:14:39 -07:00
jbox1andGitHub a757970b33 Add files via upload 2020-02-27 21:21:15 +11:00
jbox1andGitHub 6e53a57083 Create plushes.dm 2020-02-27 21:20:27 +11:00
Toast 1ae7a8e411 A better box for the future 2020-02-26 22:42:44 -05:00
Toast 3f3f345925 Delete tgstation.lk 2020-02-26 20:36:04 -05:00
DahlularandGitHub 5afc186f5c Merge pull request #210 from jbox144/patch-7
I AM A FUCKING MORON
2020-02-19 02:02:38 -07:00
jbox1andGitHub b58e849196 I AM A FUCKING MORON
REEEEEEEEE
2020-02-19 19:53:33 +11:00
DahlularandGitHub 5a893ce8a5 Merge pull request #209 from quotefox/revert-203-master
Revert "Balances the NT Private Security Officers"
2020-02-18 21:21:13 -07:00
DahlularandGitHub 01943a427e Revert "Balances the NT Private Security Officers" 2020-02-18 21:17:16 -07:00
DahlularandGitHub 41c0b98454 Merge pull request #208 from jbox144/patch-7
Milking machine
2020-02-18 21:02:00 -07:00
DahlularandGitHub 3f63196e99 Merge pull request #207 from jbox144/patch-6
"Leaky Breasts" trait
2020-02-18 20:05:42 -07:00
jbox1andGitHub 88d5e33d58 b 2020-02-19 13:03:29 +11:00
DahlularandGitHub c752529677 Merge pull request #203 from AtlasRules/master
Balances the NT Private Security Officers
2020-02-18 14:52:56 -07:00
DahlularandGitHub de20b7ec97 Merge pull request #206 from SynnGraffkin/Box-sucks
Various Box Fixes
2020-02-18 14:52:24 -07:00
DahlularandGitHub 61eab0fa60 Merge pull request #204 from zeskorion/fuck
deletes an underscore
2020-02-18 14:51:37 -07:00
jbox1andGitHub de8dd5e379 Update milking machine.dm 2020-02-16 16:08:40 +11:00
jbox1andGitHub 455fa9a56a Update recipes.dm 2020-02-16 16:07:25 +11:00
jbox1andGitHub 19f5eed0de Add files via upload 2020-02-16 16:06:55 +11:00
jbox1andGitHub 4d3d1e9a54 Create milking machine.dm 2020-02-16 16:05:00 +11:00
QuoteFoxandGitHub 70bba35545 Delete cargo.html
Not needed.
2020-02-16 02:31:45 +00:00
jbox1andGitHub 5bbcff800c Desc change 2020-02-15 21:47:49 +11:00
jbox1andGitHub 660f61fdd4 Addition of leaky fluids bahaviour and code cleanup 2020-02-15 21:39:40 +11:00
jbox1andGitHub eb3a39e506 Additional Trait "Leaky Fluids" 2020-02-15 21:36:51 +11:00
jbox1andGitHub 91f1455aac Added new trait define 2020-02-15 21:35:30 +11:00
Toast ef69449738 Imagine having the map file NOT in the map folder
Whoever did that needs punished.
2020-02-15 03:12:09 -05:00
DahlularandGitHub 4cc3b6ebc5 Merge pull request #205 from ForrestWick/firemancarry
Fireman Carry
2020-02-13 18:18:14 -07:00
ForrestWick 41870bbf24 Fireman Carry 2020-02-13 18:26:40 -06:00
zeskorionandGitHub 7b0c0b6244 Update others.dm 2020-02-12 10:04:25 -08:00
zeskorionandGitHub 79e49c5519 Merge pull request #1 from quotefox/master
a
2020-02-12 10:02:52 -08:00
HarryandGitHub fc4a80184e makes NT officers not do 65 stamina, removes a taser-related line 2020-02-09 15:14:08 +00:00
DahlularandGitHub 70e6444d47 Merge pull request #193 from Azarak/hardhats2
Adds welding hardhats, no conflicts this time
2020-02-07 23:33:00 -07:00
DahlularandGitHub fb77f87cbb Merge pull request #194 from Azarak/holofan2
ATMOS holofans and forcefield generator icon update, temperature block for holofans and force gens going into toolbelts
2020-02-07 23:32:47 -07:00
DahlularandGitHub 0b5369275e Merge pull request #199 from zeskorion/patch-1
fixes virus chems... because the last pr didnt actually get merged or something?
2020-02-07 23:32:35 -07:00
DahlularandGitHub 212f4d99b4 Merge pull request #200 from AtlasRules/master
puts the .dmm in the correct place so the lighting changes actually appear
2020-02-07 23:32:22 -07:00
DahlularandGitHub 3b56681684 Merge pull request #201 from zeskorion/patch-2
plasmamen speed
2020-02-07 23:32:08 -07:00
zeskorionandGitHub e81178a0dd aa 2020-02-07 20:51:36 -08:00
HarryandGitHub 6daa094d6d cum sex 2020-02-07 14:50:00 +00:00
zeskorionandGitHub 04a1f58d3b FUUUUUCK
I made a pr to change this, but apparently the pr didnt change anything?? I don't know what the fuck is up with that
2020-02-06 20:38:59 -08:00
quotefoxandGitHub 2f56a36960 Merge pull request #197 from AtlasRules/master
does what I meant to do the first time
2020-02-05 11:58:52 +00:00
quotefoxandGitHub 346281b22f Merge pull request #192 from Azarak/drinkstuff
Lots of new drinks and fixes to them
2020-02-05 11:56:15 +00:00
quotefoxandGitHub f6fa279f71 Merge pull request #195 from Azarak/soapstonelight
Reduces soapstone engraving light
2020-02-05 11:55:33 +00:00
quotefox a185cd7fd8 radiation storms no longer effect dorms, so RP'ers don't have to run into maint. 2020-02-05 11:46:49 +00:00
HarryandGitHub 377871614b actually fix the lighting 2020-02-03 23:11:30 +00:00
HarryandGitHub 2046f7b17b ooga booga fix lighting 2020-02-03 23:07:35 +00:00