Leo
90b2e77b78
Merge pull request #34769 from ShizCalev/var-cleanup
...
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
deathride58
84b02025c9
Merge branch 'master' into upstream-merge-34686
2018-01-21 22:38:47 +00:00
LetterJay
6094f87105
Update life.dm
2018-01-21 14:20:03 -06:00
Robustin
e1f4835b49
Ends the great monkey freezing epidemic
2018-01-21 09:23:24 -06:00
Robustin
7a16f0a3ef
Temperature Refactor and Fixes
2018-01-19 08:41:34 -06:00
deathride58
85aa297923
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:30:41 +00:00
ShizCalev
7956e3df27
Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
2018-01-07 11:02:49 -06:00
deathride58
8f593f0d00
living carbon
2018-01-04 01:36:28 -05:00
LetterJay
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
AnturK
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
Emmett Gaines
04d26d561a
Radiation makes you vomit blood and more balance changes ( #31753 )
2017-10-18 09:25:11 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
LetterJay
14dc8a5a35
Update life.dm
2017-10-13 12:30:35 -05:00
LetterJay
2d66ab4171
Update life.dm
2017-10-13 10:26:25 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
CitadelStationBot
3aafe338af
[MIRROR] Fixes adjust config ( #2723 )
...
* Fixes adjust config
* Update configuration.dm
* Update game_options.txt
* fixes persistance
2017-09-22 23:02:09 -05:00
CitadelStationBot
3c8f4ca032
[MIRROR] Monkeys are now more likely to become Gorillas ( #2806 )
...
* Monkeys are now more likely to become Gorillas (#30775 )
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Monkey to Gorilla now more likely
* Monkeys are now more likely to become Gorillas
2017-09-17 12:02:23 -05:00
CitadelStationBot
c4e6642530
[MIRROR] Stops dead monkeys from moving ( #2780 )
...
* Merge pull request #30709 from vuonojenmustaturska/hisgrace
Stops dead monkeys from moving
* Stops dead monkeys from moving
2017-09-15 03:23:40 -05:00
CitadelStationBot
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
AnturK
1553e26fe2
I missed that in last fix. ( #30590 )
2017-09-11 14:37:22 -05:00
Poojawa
ce787e7726
Reverts sav file persistance for poly/pun-pun ( #2654 )
...
* Reverts sav file persistance for poly/pun-pun
* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
LetterJay
96c790a81f
Unruntimes fdel on savefiles
2017-09-02 05:23:35 -05:00
CitadelStationBot
c2a792d577
Converts npc saves to jsons
2017-08-30 08:01:36 -05:00
kevinz000
8d0c29f9da
ok
2017-08-29 19:56:27 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
CitadelStationBot
2ff65a8e39
[MIRROR] Lowers the chance for monkeys to become gorillas ( #2476 )
...
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
2017-08-29 00:59:34 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
41b0f9f9d4
Gorillas
2017-08-20 19:56:21 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
97243fca3a
Moved can_trigger_gun to item/weapon parent
2017-08-14 16:05:43 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
LetterJay
344dc1a061
Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257
...
[MIRROR] Fixes monkeys trying to take offhands
2017-07-15 23:19:59 -05:00
CitadelStationBot
f634966a34
Fixes monkeys trying to take offhands
2017-07-15 22:33:14 -05:00
CitadelStationBot
3ee26917bd
Organ Update [Cloning isn't broken edition]
2017-07-14 09:00:36 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
