Commit Graph
18397 Commits
Author SHA1 Message Date
kevinz000andGitHub 50c3a127f2 Update all_nodes.dm 2018-09-05 06:49:50 -07:00
kevinz000andGitHub dca6ea461b Update misc_designs.dm 2018-09-05 06:49:20 -07:00
kevinz000andGitHub f694924573 Update _glasses.dm 2018-09-05 06:47:23 -07:00
CitadelStationBot 22e3211f44 Automatic changelog generation for PR #7527 [ci skip] 2018-09-03 12:49:48 -05:00
deathride58andGitHub 0bb4cec65d Merge pull request #7527 from Poojawa/we_goin_do_what_they_say_cant_be_done
Fixes some missing magmag mag icons
2018-09-03 13:49:46 -04:00
CitadelStationBot a7efb2664f Automatic changelog generation for PR #7497 [ci skip] 2018-09-03 12:49:17 -05:00
deathride58andGitHub d57db6ba81 Merge pull request #7497 from improvedname/more-nerf
Makes the syndicate suspicous toolbox not be called "suspicous anymore" but just black and red striped instead.
2018-09-03 13:49:15 -04:00
deathride58andGitHub c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
CitadelStationBot 5425f02612 Automatic changelog generation for PR #7517 [ci skip] 2018-09-03 12:47:01 -05:00
deathride58andGitHub af97633db5 Merge pull request #7517 from Poojawa/rusty_vore
Forces Vore prefs to use rust_g
2018-09-03 13:46:59 -04:00
CitadelStationBot 08efaeda52 Automatic changelog generation for PR #7518 [ci skip] 2018-09-03 12:44:18 -05:00
deathride58andGitHub d3c116d1a0 Merge pull request #7518 from Poojawa/cit_pref_issues
Fixes Cit_toggles by sanitizing it with less autism
2018-09-03 13:44:16 -04:00
deathride58andGitHub 75bddc63d6 Merge pull request #7524 from nik707/pubby-changes
adds missing shutters to pubby
2018-09-03 13:44:01 -04:00
deathride58andGitHub 95548530b3 Merge pull request #7526 from Tupinambis/TheSpareV2
Makes Spare more Accessible for heads (V2 because I forgot to compile the first time haha yes)
2018-09-03 13:43:31 -04:00
nik707 31215064ab fixes me being retarded 2018-09-01 18:42:04 -05:00
CitadelStationBot a8a6bcd23e Automatic changelog generation for PR #7512 [ci skip] 2018-09-01 05:11:26 -05:00
deathride58andGitHub 779094a37d Merge pull request #7512 from Poojawa/insult-everything
Adds *insult
2018-09-01 06:11:25 -04:00
CitadelStationBot 147089a284 Automatic changelog generation for PR #7511 [ci skip] 2018-09-01 05:11:14 -05:00
deathride58andGitHub fe7b4d888e Merge pull request #7511 from Poojawa/patch-1
Updates IC issue message
2018-09-01 06:11:12 -04:00
CitadelStationBot a7766d63f6 Automatic changelog generation for PR #7503 [ci skip] 2018-09-01 05:10:45 -05:00
deathride58andGitHub c115c9dd96 Merge pull request #7503 from nik707/omega-changes
adds toxins to omega
2018-09-01 06:10:43 -04:00
deathride58andGitHub 60c7c2cda5 Merge pull request #7506 from Citadel-Station-13/kevinz000-patch-2
Clamps flash confusion
2018-09-01 06:09:32 -04:00
Poojawa f194190621 Fixes some missing magmag mag icons 2018-09-01 03:52:24 -05:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
CitadelStationBot b08b05fafb Automatic changelog generation for PR #7513 [ci skip] 2018-08-31 14:41:39 -05:00
nik707andkevinz000 6e087876e5 makes atmos more secure (#7513) 2018-08-31 12:41:37 -07:00
nik707 797ab5ea86 fixes shezzas ree 2018-08-31 14:15:07 -05:00
CitadelStationBot 4649e8403c Automatic changelog generation for PR #7521 [ci skip] 2018-08-31 14:13:52 -05:00
Poojawaandkevinz000 4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
Poojawaandkevinz000 160f981fcc Fixes Defib mount cloning (#7520) 2018-08-31 12:13:23 -07:00
Poojawa 1975c74efb Fixes Cit_toggles by sanitizing it with less autism
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
2018-08-31 03:11:41 -05:00
Poojawa 3ffdfb5bee Forces Vore prefs to use rust_g
This probably fixes vore specific prefs breaking.
2018-08-31 02:46:55 -05:00
NickandGitHub fad5d5db83 Update toolbox.dm 2018-08-29 17:49:00 +02:00
NickandGitHub 03358c2db6 Update toolbox.dm 2018-08-29 17:48:16 +02:00
Poojawa c22d1cacb8 Adds *insult 2018-08-29 03:25:27 -05:00
PoojawaandGitHub 6344de3a14 Updates IC issue message 2018-08-28 22:50:34 -05:00
deathride58andGitHub 4446251a6d nerfs nerve support because lets face it, it's just straight-up cancer 2018-08-28 08:11:09 -04:00
Trilbyspacecloneandkevinz000 42c39d8908 Adv illegal ballistic Third times the charm? (#7426)
* Adds in a new tec node

* Fixes it maybe hopefully?

* MESSES WITH E-SHOTGUNS
If the blaster shotgun is broke then blame me for this

* Perhaps properly adds in the node!

* Meh

* .dm remove

* boop

* NULL

* Readds the files 

missed re-adding them on my fork

* "

"

* Wait maybe if I try this it all works

It has nothing to do with anything and dose not even show me deleting

* Back to square one

...

* X to doubt 

[X]

* huh

* Look back at the past

Look were the error is

* Maybe that bolt action gun is messing with things

* hmm

* I know these two ammos are ok

* m45?

* m45?

* I must be doing this .45 ammo wrong

* Update pistol.dm

* Lets see

* Update all_nodes.dm

* Maybe?

* m9mm

* Lets try that

* so its linked correctly

* Update pistol.dm

* removes some spaces

* Revert "Testing code"
2018-08-28 02:44:27 -07:00
CitadelStationBot 4661e26947 Automatic changelog generation for PR #7507 [ci skip] 2018-08-28 04:41:03 -05:00
deathride58andkevinz000 69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
kevinz000andGitHub 0a39366f1a Update flash.dm 2018-08-27 17:57:05 -07:00
nik707 da638407ab adds toxins to omega 2018-08-27 00:55:53 -05:00
deathride58andGitHub 778e45a1e9 Merge pull request #7494 from Citadel-Station-13/kevinz000-patch-6
makes cns rebooters useful again
2018-08-26 21:25:42 -04:00
deathride58andGitHub 0f53432680 Merge pull request #7500 from Citadel-Station-13/kevinz000-patch-7
fixes techweb node default cost being an int instead of a list
2018-08-26 21:25:09 -04:00
deathride58andGitHub 1e4bcc7af3 Merge pull request #7493 from Citadel-Station-13/kevinz000-patch-2
*FIXES* comms consoles not working after autocall - yes this is a bug
2018-08-26 21:23:23 -04:00
CitadelStationBot 186ee000a0 Automatic changelog generation for PR #7492 [ci skip] 2018-08-26 20:23:13 -05:00
deathride58andGitHub 7a6f8ef5a3 Merge pull request #7492 from Tupinambis/Flukies
Nuclear Operatives are no longer exclusively human
2018-08-26 21:23:11 -04:00
deathride58andGitHub bcb6a495b0 Merge pull request #7490 from Citadel-Station-13/kevinz000-patch-5
allows emagged shuttle purchase requirement but this time it merges into master instead of a broken branch
2018-08-26 21:22:49 -04:00
deathride58andGitHub 107034d34c Merge pull request #7502 from Citadel-Station-13/kevinz000-patch-8
Makes the code not go "no you" when admins try to note people (NOTE: NOTES ARE STILL BUGGED, this just fixes the worst issue)
2018-08-26 21:21:38 -04:00
deathride58andGitHub c5cb25fb50 Merge pull request #7495 from Citadel-Station-13/kevinz000-patch-3
Fixes banning
2018-08-26 21:20:33 -04:00