 ShizCalevandCitadelStationBot
|
8bd1f07353
|
Fixes pet collars not updating icons (#34184)
|
2018-01-12 06:17:04 -06:00 |
|
|
YPOQandCitadelStationBot
|
7e740208f9
|
Makes bot emagging more consistent (#34274)
|
2018-01-11 21:34:44 -06:00 |
|
|
AnturKandCitadelStationBot
|
7f9d721a72
|
Fixes mobs on lavaland targeting through walls on wakeup (#34280)
|
2018-01-11 21:33:34 -06:00 |
|
|
orangesandCitadelStationBot
|
b128c9d3b5
|
Merge pull request #34117 from ShizCalev/medbot-tweak
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
|
2018-01-11 14:07:28 -06:00 |
|
|
LeoandCitadelStationBot
|
5cb74c909c
|
Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
|
2018-01-11 07:40:33 -06:00 |
|
|
deathride58andGitHub
|
ff83b6451b
|
Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065
[MIRROR] Fixes reflections
|
2018-01-10 20:21:56 +00:00 |
|
|
LeoandCitadelStationBot
|
5cc7492f0a
|
Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
|
2018-01-10 03:12:39 -06:00 |
|
|
RobustinandCitadelStationBot
|
34919f7bce
|
Fixes reflections
|
2018-01-10 03:11:48 -06:00 |
|
|
deathride58andGitHub
|
b35911b02c
|
Update cleanbot.dm
|
2018-01-08 16:42:18 -05:00 |
|
|
deathride58andGitHub
|
6957a6f13f
|
Merge branch 'master' into upstream-merge-34105
|
2018-01-08 20:03:41 +00:00 |
|
|
orangesandCitadelStationBot
|
1e9598dfbd
|
Clean up a bunch of undefined arg runtimes
|
2018-01-07 20:53:12 -06:00 |
|
|
deathride58
|
3e937fcecf
|
Merges #4679 , #4670 , and #4677
|
2018-01-07 15:29:42 -05:00 |
|
|
deathride58
|
273b38a765
|
mob living simple_animal
|
2018-01-04 01:23:37 -05:00 |
|
|
LetterJayandGitHub
|
d035f16aca
|
Update basilisk.dm
|
2018-01-02 05:24:47 -06:00 |
|
|
LetterJay
|
f2f6d9d910
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
# Conflicts:
# code/modules/events/alien_infestation.dm
# code/modules/events/spider_infestation.dm
# code/modules/events/vent_clog.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
|
2018-01-02 05:16:13 -06:00 |
|
|
LetterJay
|
9ede14fbce
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574
|
2018-01-01 14:14:06 -06:00 |
|
|
LetterJay
|
30d4b25aee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
|
2018-01-01 14:09:07 -06:00 |
|
|
LetterJay
|
168519c328
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
|
2018-01-01 07:00:34 -06:00 |
|
|
LetterJayandGitHub
|
32291c247b
|
Update megafauna.dm
|
2017-12-30 13:33:45 -06:00 |
|
|
LetterJayandGitHub
|
2994b4b7c2
|
Update blood_drunk_miner.dm
|
2017-12-30 13:33:37 -06:00 |
|
|
LetterJayandGitHub
|
449ae34621
|
Update hostile.dm
|
2017-12-30 13:33:25 -06:00 |
|
|
LetterJayandGitHub
|
b260704381
|
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
[MIRROR] Turns the baseturf var into a part time list
|
2017-12-30 13:19:00 -06:00 |
|
|
LetterJayandGitHub
|
a3ebaa5de8
|
Merge branch 'master' into upstream-merge-32311
|
2017-12-29 18:38:50 -06:00 |
|
|
Tad HardestyandCitadelStationBot
|
0418ee4df6
|
Replace explicit z-level checks with defines
|
2017-12-29 13:41:10 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
8059894d7d
|
Merge pull request #33903 from AnturK/pilot-fixes
Fixes mobs targeting from inside things.
|
2017-12-29 10:01:57 -06:00 |
|
|
LetterJay
|
518b264654
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
|
2017-12-29 01:34:17 -06:00 |
|
|
LetterJay
|
8a792d6ef6
|
more save points
|
2017-12-29 00:07:36 -06:00 |
|
|
kevinz000andCitadelStationBot
|
bf7838aded
|
[READY]Adds picking up corgis and pAIs!
|
2017-12-27 15:47:57 -06:00 |
|
|
orangesandCitadelStationBot
|
269208f687
|
[READY]Component Forensics and Item Blood OverlayS!
|
2017-12-27 15:19:14 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
4499ff2fad
|
Merge pull request #33834 from Xhuis/drone_hats
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
|
2017-12-26 18:38:42 -06:00 |
|
|
CitadelStationBotandkevinz000
|
8aed987bd9
|
[MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544)
* Fixes emagged cleanbot acid attack doing no damage (#33848)
* Fixes emagged cleanbot acid attack doing no damage
|
2017-12-26 13:58:16 -08:00 |
|
|
Emmett GainesandCitadelStationBot
|
9d0a4722e5
|
turns the baseturf var into a part time list (#33705)
|
2017-12-25 19:11:06 -06:00 |
|
|
LetterJayandGitHub
|
ac5503d338
|
Merge branch 'master' into upstream-merge-33055
|
2017-12-25 04:10:34 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
164db7ae9b
|
Prefixed all disability defines with DISABILITY_ to fix a name collision
|
2017-12-24 15:03:30 -06:00 |
|
|
LetterJayandGitHub
|
92c347d068
|
Merge branch 'master' into upstream-merge-33246
|
2017-12-20 00:27:06 -06:00 |
|
|
LetterJayandGitHub
|
408182758f
|
Merge branch 'master' into upstream-merge-33498
|
2017-12-19 17:50:11 -06:00 |
|
|
LetterJayandGitHub
|
8662e4a53c
|
Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
[MIRROR] Mi-go
|
2017-12-18 15:20:00 -06:00 |
|
|
XDTMandCitadelStationBot
|
3af0aa2489
|
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
|
2017-12-18 15:19:53 -06:00 |
|
|
LetterJayandGitHub
|
8fde63e016
|
Update simple_animal.dm
|
2017-12-18 15:15:34 -06:00 |
|
|
LetterJayandGitHub
|
bd1c186111
|
Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
|
2017-12-17 21:26:08 -06:00 |
|
|
LetterJayandGitHub
|
6aa1a86f88
|
Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529
[MIRROR] Removed drone light in favor of night vision
|
2017-12-17 20:37:39 -06:00 |
|
|
vuonojenmustaturskaandCitadelStationBot
|
8cbad06f35
|
Advanced mob laziness
|
2017-12-17 19:36:04 -06:00 |
|
|
LetterJayandGitHub
|
1c380e3ed4
|
Update verbs.dm
|
2017-12-17 17:50:05 -06:00 |
|
|
Emmett GainesandCitadelStationBot
|
f875d4e176
|
Defines math, take 2
|
2017-12-17 10:02:43 -06:00 |
|
|
ArmhulenandCitadelStationBot
|
8a0aa32335
|
Mi-go
|
2017-12-17 04:11:01 -06:00 |
|
|
LetterJayandGitHub
|
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 |
|
|
Trevor SerpasandCitadelStationBot
|
f7a943575d
|
Removed drone light in favor of night vision
|
2017-12-15 03:26:35 -06:00 |
|
|
Ashe HiggsandCitadelStationBot
|
2aef00daf0
|
All-In-One grinder results are now defined by type, not by huge lists
|
2017-12-14 15:48:39 -06:00 |
|
|
vuonojenmustaturskaandCitadelStationBot
|
fcceb5ec77
|
Finishes the forceMove port
|
2017-12-14 15:40:08 -06:00 |
|