Commit Graph

6312 Commits

Author SHA1 Message Date
kevinz000 350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000 26525b8fa7 s 2020-01-16 00:14:03 -07:00
kevinz000 1acac87da3 compile 2020-01-15 23:54:30 -07:00
kevinz000 45c92bcb6f s 2020-01-15 19:07:47 -07:00
kevinz000 02841f8e92 compile 2020-01-15 18:49:37 -07:00
kevinz000 b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
kevinz000 9fd9f60855 compile 2020-01-11 10:49:44 -08:00
kevinz000 b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000 2c245a18fd compile 2020-01-10 13:43:53 -08:00
kevinz000 f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000 24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00
kevinz000 5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghom 07a5f052d3 Merge pull request #10400 from chefferz/chefferz-toiletshuttle
Gives ability to buckle yourself to a toilet
2020-01-04 14:25:54 +01:00
Ghom 3086b5eb38 boolean 2020-01-04 14:19:15 +01:00
Ghom 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
Ghom 39da7cc58e Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
2020-01-04 14:03:01 +01:00
Linzolle d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
kevinz000 d1d9b7a179 Merge pull request #10403 from r4d6/patch-1
Add a way to make opaque plastic flaps
2020-01-03 08:16:17 -08:00
kevinz000 04649efc62 Update stack.dm 2020-01-03 02:46:57 -08:00
nik707 0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
Lin f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
r4d6 6e5d04ff1f Adding a way to make opaque plastic flaps 2020-01-02 02:52:48 -05:00
chefferz 46feaf9663 Update watercloset.dm 2020-01-02 01:09:29 -05:00
kevinz000 e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
2020-01-01 22:07:18 -08:00
nik707 be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
2020-01-01 20:28:15 -06:00
Putnam 96cbc2704f Made random always available. 2020-01-01 00:32:49 -08:00
Putnam d6fece9a57 removed extended weighting on intrigue 2020-01-01 00:28:39 -08:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
kevinz000 1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts
Ghost Cafe patrons now spawn with chameleon kits
2019-12-31 19:28:55 -08:00
CameronWoof 58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy 2019-12-31 17:44:18 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Ghom cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
2019-12-31 18:01:23 +01:00
KathrinBailey 243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey 0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey f2e9ba2a8e Makes lockers into subtypes
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
Ghom 0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256
Buffs bandoliers to hold more types of casings.
2019-12-31 14:36:53 +01:00
Ghom 78e4c608ad Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
2019-12-31 13:16:07 +01:00
Putnam cf77f7b18e Balance pass (see description)
1. Made bloodsuckers more likely on calm, story, slightly more common on intrigue
2. Made intrigue no longer have low threat by default
3. Made abductors have lower weights in general, making them less likely to show up
4. Made sentient disease, revenant less likely on calm
5. Added a new storyteller, "Conversion", which rolls conversion antags.
2019-12-31 02:40:50 -08:00
Trilbyspaceclone c81d0e8b66 Update energy.dm 2019-12-31 05:25:12 -05:00
Hatterhat 5a497b02ac hey i'm WALKIN here 2019-12-31 01:56:01 -06:00
kevinz000 79c609aa40 Update telescopic_iv.dm 2019-12-30 17:55:59 -08:00
Putnam 018904694f caps 2019-12-30 17:03:06 -08:00
nik707 5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow
marshmallow
2019-12-30 18:31:06 -06:00
nik707 8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
nik707 23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
throwing now only randomly turns things if you are on harm intent
2019-12-30 18:28:16 -06:00
Putnam b5ccbe86c0 Halved midround antag injection chance on calm 2019-12-30 15:40:20 -08:00
CameronWoof d8c9dd967b Dolly Dress-Up: Ghost Hunter Edition 2019-12-30 14:31:47 -08:00