Commit Graph

290 Commits

Author SHA1 Message Date
Improvedname
0c1ddee60e SINGING 2020-03-06 20:12:43 +01:00
Dahlular
1b2a88e9b3 Merge pull request #214 from Investigator77/I-FIXED-IT-MOM
(Fixed!) Exosuit and SEVA changes
2020-03-03 00:16:45 -07:00
Dahlular
0074c18915 Merge pull request #211 from zeskorion/master
keepin beeviro porting consistent for ya
2020-03-03 00:16:29 -07:00
zeskorion
b8522cc0c7 adds special honey 2020-02-27 12:14:39 -08:00
zeskorion
81fbc375b0 Update beebox.dm 2020-02-27 12:06:40 -08:00
Muhreen
7c3a8c6e6a Merge pull request #9 from Investigator77/Investigator77-patch-7
Adds the code that makes the new icons work
2020-02-27 17:01:05 -03:00
Muhreen
4ce7bdf8fe Adds the code that makes the new icons work
awooogoaaaaaa
2020-02-27 17:00:40 -03:00
zeskorion
9adf4d194b Update monkey.dm 2020-02-27 11:33:03 -08:00
Muhreen
9c3c1c5eaa Merge pull request #6 from Investigator77/Investigator77-patch-5
Monolith armor hype
2020-02-27 05:27:26 -03:00
Muhreen
d89cac02c4 Monolith armor hype 2020-02-27 05:26:55 -03:00
Muhreen
245d45291f Merge pull request #5 from Investigator77/Investigator77-patch-4
Monolith BDU
2020-02-27 05:22:33 -03:00
Muhreen
a93df81e71 Monolith BDU 2020-02-27 05:22:05 -03:00
Muhreen
6e2ec4b01e Updates descriptions and balances suits 2020-02-27 05:17:01 -03:00
zeskorion
632d06c747 Update monkey.dm 2020-02-23 17:25:04 -08:00
zeskorion
2312f4a5a7 Update bodyparts.dm 2020-02-23 17:24:10 -08:00
zeskorion
be804471c8 Update head.dm 2020-02-23 17:20:24 -08:00
zeskorion
ac23e48246 FUCK monkeys
not that way tho
2020-02-19 14:19:44 -08:00
zeskorion
ee4c940ee5 k 2020-02-19 13:53:57 -08:00
zeskorion
c74d1b8f64 disease update 2020-02-19 11:28:17 -08:00
Dahlular
01943a427e Revert "Balances the NT Private Security Officers" 2020-02-18 21:17:16 -07:00
Dahlular
c752529677 Merge pull request #203 from AtlasRules/master
Balances the NT Private Security Officers
2020-02-18 14:52:56 -07:00
Dahlular
61eab0fa60 Merge pull request #204 from zeskorion/fuck
deletes an underscore
2020-02-18 14:51:37 -07:00
Dahlular
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
zeskorion
7b0c0b6244 Update others.dm 2020-02-12 10:04:25 -08:00
Harry
fc4a80184e makes NT officers not do 65 stamina, removes a taser-related line 2020-02-09 15:14:08 +00:00
Dahlular
70e6444d47 Merge pull request #193 from Azarak/hardhats2
Adds welding hardhats, no conflicts this time
2020-02-07 23:33:00 -07:00
Dahlular
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
Dahlular
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
zeskorion
e81178a0dd aa 2020-02-07 20:51:36 -08:00
zeskorion
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
quotefox
346281b22f Merge pull request #192 from Azarak/drinkstuff
Lots of new drinks and fixes to them
2020-02-05 11:56:15 +00:00
Azarak
7935c9d095 Update soapstone.dm 2020-02-03 23:36:55 +01:00
Azarak
d5593ef017 Holofans, forcefield gens, temperature block 2020-02-03 21:58:35 +01:00
Azarak
088af5e060 Update hardhat.dm 2020-02-03 21:46:31 +01:00
Azarak
4c06f50180 Welding hardhats 2020-02-03 21:35:06 +01:00
Azarak
dea2f73497 Drink updates 2020-02-03 20:23:39 +01:00
Dahlular
f8a887a122 Merge pull request #191 from Azarak/fakewalls
Fixes false walls
2020-02-03 10:34:42 -07:00
Dahlular
10cb4f3f0b Merge pull request #181 from zeskorion/master
Smal plasmaman tweak
2020-02-03 10:32:16 -07:00
Dahlular
378729a86d Merge pull request #188 from zeskorion/oops
[beepsky rants] i hate chemids
2020-02-03 10:31:10 -07:00
Dahlular
b649bec55d Merge pull request #182 from MalricB/darntootin
It's 12 o'clock
2020-02-03 10:29:06 -07:00
CygnusB
6cdbdca11f Fixes Dueling.dm examine error
and also fixes my retardation
2020-02-03 09:50:25 -03:00
Azarak
a741915398 Fixes false walls 2020-02-03 04:11:50 +01:00
zeskorion
7403b6b908 Update other_reagents.dm 2020-02-02 12:04:31 -08:00
zeskorion
5af329e404 Update plasmamen.dm 2020-02-02 12:01:23 -08:00
zeskorion
cade7e0330 FUCK citchem 2020-02-02 11:59:46 -08:00
Dahlular
5305e1a4ba Merge pull request #177 from Azarak/neurotoxin
Re-adds neurotoxin and adds neurosmash
2020-02-01 07:22:22 -07:00
CygnusB
34f71c489b It's 12 o'clock
Darn tootin' pardner
2020-01-31 19:03:44 -03:00
zeskorion
aa57777244 Update plasmamen.dm 2020-01-30 19:51:23 -08:00
Dahlular
f9990f20b2 Merge pull request #178 from Azarak/looc
Ports lightmode/darkmode fixes
2020-01-30 05:25:29 -07:00