Commit Graph

13249 Commits

Author SHA1 Message Date
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom
44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
Ghom
68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
2020-03-05 00:26:12 +01:00
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Ghom
ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix
Fixes reagent containers transfer cycling
2020-03-04 23:17:00 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00
Artur
f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
Lin
1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000
7291417244 fix 2020-03-03 20:57:03 -07:00
kevinz000
f8187d0fbf optimize move under living 2020-03-03 20:51:50 -07:00
kevinz000
334f1cc1cf linzolle 2020-03-03 20:48:39 -07:00
kevinz000
1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
Ghom
284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
Ghom
0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01:00
Lin
622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin
6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
Ghom
107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
Ghom
6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
Ghom
294668d6e1 Merge pull request #11300 from kappa-sama/patch-11
removes obsolete laptop slowdown
2020-03-03 13:24:15 +01:00
Ghom
c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19
*HELPS* with the atrocious GC situation regarding blobs
2020-03-03 13:23:28 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
c21bd60929 fix 2020-03-03 03:04:23 -07:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Ghom
bee392257e Update monkey.dm 2020-03-02 23:02:16 +01:00
Ghom
99841c9447 Update pai_shell.dm 2020-03-02 23:00:41 +01:00
Ghom
aa1f9a3695 Update _drone.dm 2020-03-02 22:59:00 +01:00
Ghom
15fed0386c Update lizard.dm 2020-03-02 22:56:15 +01:00
Ghom
c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap
Proper supermatter tweaks
2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19
Pushing stuff now checks for Process_Spacemove on the automatic step
2020-03-02 16:34:18 +01:00
Ghom
4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299
Makes most winter coats and hoods have their own desc
2020-03-02 16:18:47 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000
7ade79ce80 small fix 2020-03-02 03:05:51 -07:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00