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
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
9288106128
Fixes monkeys having two Initializes and not returning a hint ( #1188 )
2017-05-27 13:29:32 -07:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
CitadelStationBot
1da5a27b98
Adjusts ear/eye protection based on missing organs ( #999 )
2017-05-18 12:07:33 -05:00
CitadelStationBot
56d5e12263
Moves languages to a holder datum, gives mind its own language holder
2017-05-05 08:13:04 -05:00
CitadelStationBot
84321916a5
Refactors ears into organs ( #513 )
...
* Refactors ear damage into ear organs
* Update human.dm
* Update species.dm
* Delete species.dm.rej
* Update tgstation.dme
* Delete tgstation.dme.rej
* Delete human.dm.rej
* Update tongue.dm
* Delete surgery.dmi
* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
884fb45516
Fixes compile issues with vore code ( #362 )
...
* Fixes compile issues with vore code
* Update voreconstants.dm
* Update resize_vr.dm
* Update tgstation.dme
* Update parrot.dm
* Update pet.dm
* Update fox.dm
* Update mouse.dm
* Update farm_animals.dm
* Update dog.dm
* Update cat.dm
* Update monkey.dm
* Update alien.dm
* Update vore_vr.dm
* Update vorepanel_vr.dm
* Update bellymodes_vr.dm
* Update belly_vr.dm
* Update living_vr.dm
* Update voreconstants.dm
* Update fox.dm
2017-04-14 19:39:08 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
Poojawa
f67e9f6d87
Bleeding edgy refresh ( #303 )
...
* not code stuff
* other things
* global vars, defines, helpers
* onclick hud stuff, orphans, world.dm
* controllers and datums
* game folder
* everything not client/mobs in modules
* client folder
* stage 1 mob stuff
* simple animal things
* silicons
* carbon things
* ayylmaos and monkeys
* hyoomahn
* icons n shit
* sprite fixes
* compile fixes
* some fixes I cherrypicked.
* qdel fixes
* forgot brain refractors
2017-03-21 11:44:10 -05:00
Poojawa
6674f9fc15
Tg 2 11 sync ( #215 )
...
* first series of updates
* datums
* games folder
* admin and atmosia stuffs
* moar
* mob updates borg riding
* sprites and stuff
* fixes for various things
* oops. some missed fixes
2017-02-12 03:56:14 -06:00
Poojawa
449614df96
Actually cleans up un-needed files. ( #210 )
...
* actually gets rid of excess files
* obsolete admin files
2017-02-08 22:35:56 -06:00
LetterJay
a432886ba3
sync
2017-02-07 00:58:30 -06:00
