Commit Graph

28 Commits

Author SHA1 Message Date
Chloe Carver-Brown
7f7186dfd3 Unga weapons 2021-03-02 11:24:07 +00:00
Vladin
17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
CygnusB
8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB
958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB
f21db73775 fuck yeah
banana
2021-01-19 03:31:33 -03:00
Chemlight
358fb00492 Fixing personal code
Darn it with these /datum/ changes
2021-01-11 20:46:10 -08:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
kevinz000
5eb8b535c3 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-17 00:31:16 -03:00
Chemlight
8c0f1756a1 Funny-character-bus-code
This little pull is litterally a pull for a single character I'd like to bus, basicly a walking chem dispenser, so lets go!
2020-11-09 23:03:12 -08:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
kevinz000
2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Chemlight
5174ab881a X-01 MultiPhase Energy Gun Buff
Increased the charge capacity of the X-01's blaster by 60% along with it's charge capacity, allowing 16 lethal shots, 40 disabler, or 16 stun shots. Origionally the stun energy cost was at a whole 200 charge reduction , now being 100 to represent the power in comparison to a tactical energy gun that spent half the amount of energy in comparison.
2020-10-17 00:03:31 -07:00
Dip
aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
Chemlight
6ad704e532 Round start Warden shotgun
"Due to unfortunate events with mishandling equipment in the security departments, we have exchanged the mutinition found in the compact shotgun found in the warden's locker due to a 'workplace hazard',"
2020-09-24 21:23:41 -07:00
BoxyBoy
5a7ac28c16 Adds a FAL
Adds code and spirtework for an FAL.
2020-07-03 17:52:58 -06:00
Dahlular
2459570517 Merge pull request #232 from improvedname/War
Does #231 but properly
2020-03-22 20:27:55 -06:00
Improvedname
f376b64f31 AAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-03-20 22:50:57 +01:00
Improvedname
f014a310f6 Boom 2020-03-17 17:53:22 +01:00
Muhreen
4ce7bdf8fe Adds the code that makes the new icons work
awooogoaaaaaa
2020-02-27 17:00:40 -03:00
CygnusB
6cdbdca11f Fixes Dueling.dm examine error
and also fixes my retardation
2020-02-03 09:50:25 -03:00
CygnusB
34f71c489b It's 12 o'clock
Darn tootin' pardner
2020-01-31 19:03:44 -03:00
Azarak
db540ac496 Botany stuffs 2019-12-06 17:54:19 +01:00
Azarak
d0b00ce298 Ports taser changes 2019-11-15 18:43:07 +01:00
Quotefox
7091cdbe8c Uploading all files. 2019-09-23 18:26:34 +02:00