Commit Graph

3543 Commits

Author SHA1 Message Date
kevinz000
ded4d1bed6 compile 2020-01-15 18:58:26 -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
c0274b1bc6 compile 2020-01-10 13:28:56 -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
e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000
2a304800df more reformatting 2020-01-07 11:46:32 -08:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
3efdf013e6 mobility flags 2020-01-06 21:47:27 -08:00
kevinz000
7006f2b1be more compile stuff 2020-01-06 04:23:52 -08:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
kevinz000
1f2597784f git commit death 2020-01-05 15:40:23 -08:00
kevinz000
b4736febcf uhh 2020-01-04 13:02:23 -08: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
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
Lin
5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
2020-01-02 23:54:14 +00:00
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
2020-01-01 20:28:35 -06:00
CameronWoof
9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
kevinz000
68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000
f920e7b73c changes 2019-12-31 10:08:14 -08:00
Hatterhat
4c5f6f895b tgstation 42481 2019-12-31 00:07:36 -06:00
nik707
70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495
chestbursters deleting brains fix.
2019-12-30 18:31:34 -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
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000
ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480
Fixing a few consistency issues with Nightmares.
2019-12-30 00:15:03 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
kevinz000
47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
kevinz000
310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
Putnam3145
640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
2019-12-29 20:54:55 -08:00
Ghommie
87cca7a649 ...which var are you? 2019-12-30 01:05:54 +01:00
Ghommie
8a32b89f17 Wait a minute... 2019-12-30 01:05:21 +01:00
Ghommie
55cb844bc2 chestbursters deleting brains fix. 2019-12-30 01:00:36 +01:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
Ghom
d1a4bf6895 Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
2019-12-29 17:30:59 +01:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Putnam
ed0c91b556 Makes ass slap attempts fail more loudly on opted-out mobs 2019-12-28 16:23:02 -08:00
Ghom
4fb549631f Don't use named arguments on new, please. 2019-12-28 19:12:10 +01:00