Mark van Alphen
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
Mark van Alphen
a2a95383a8
Add some extra offstation checks
2019-06-02 03:24:38 +02:00
Mark van Alphen
0f98a95666
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-13 22:14:38 +02:00
AffectedArc07
510c210930
Merge
2019-05-09 17:06:35 +01:00
Mark van Alphen
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
Fox McCloud and GitHub
79815eb042
Merge pull request #11357 from Markolie/lighting
...
Lighting system update
2019-05-08 00:27:16 -04:00
Fox McCloud and GitHub
4ec43eff59
Merge pull request #11455 from AffectedArc07/why
...
while(TRUE) removes a while(TRUE) loop
2019-05-07 16:12:55 -04:00
AffectedArc07
f2bcd204bc
Fixes captains displaycase [Hooks P3]
2019-05-05 22:31:24 +01:00
AffectedArc07
f37cfe498d
Removes something god awful
2019-05-04 09:37:22 +01:00
Mark van Alphen
6d8ec82733
Fix dynamic lighting on shuttles
2019-05-04 05:51:13 +02:00
Mark van Alphen
35b1cee88b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Kyep
29d20e6c4d
Fixes runtime in job_exp.dm
2019-04-30 18:28:00 -07:00
Mark van Alphen
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
AffectedArc07
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
Kyep
3ef424eb5c
upgrades ID computer
2019-04-23 21:02:27 -07:00
Mark van Alphen
7fef96e38d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-04-21 23:27:23 +02:00
Mark van Alphen
c878f8e36e
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
AffectedArc07
52dff88bd9
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
Mark van Alphen
a21ec0f30b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
CornMyCob
9f5b3fc796
updates
2019-04-02 20:26:23 +01:00
Kyep
b13c19ce65
clarify
2019-03-29 22:32:30 -07:00
Kyep
4bde616e4d
fixes bug, refactor to use consistent procs
2019-03-29 21:48:10 -07:00
Kyep
aca0105fe1
Head playtime reqs now = 5h in department
2019-03-29 04:23:43 -07:00
datlo
673ecd288e
antag clowns can toggle clumsy on and off
2019-02-19 20:33:36 +00:00
datlo
91792b09c1
Prevent objectives from targetting offstation roles
...
also remove nukie flavor text and prevent golem targetting
2019-02-16 15:09:25 +00:00
variableundefined and GitHub
4df2c24fe9
Merge pull request #10903 from farie82/why-is-this-here
...
Removes some special cases for the chaplains religion
2019-02-16 07:34:09 +08:00
variableundefined and GitHub
e217ee4387
Merge pull request #10877 from TDSSS/NT-rep-access-change
...
Remove HOP access from NT rep, Magistrate
2019-02-14 21:37:22 +08:00
joep van der velden
562f8e7228
yep
2019-02-14 13:56:23 +01:00
variableundefined and GitHub
4dda3d4583
Merge pull request #10827 from Shadeykins/GeneticsTraits
...
Removes several round-start disabilities, adds chav.
2019-02-11 20:50:41 +08:00
variableundefined and GitHub
943a21a776
Merge pull request #10818 from datlo/freegolems
...
Port Mineral golems and Free Golems
2019-02-11 20:37:07 +08:00
TDSSS
fc8ea82c1b
NT rep access change.
2019-02-11 03:23:23 +01:00
variableundefined and GitHub
24661d2c44
Merge pull request #10833 from Kyep/ends_geezer_cheat
...
Removes age-based weighting for head/captain job selection
2019-02-08 19:36:56 +08:00
Shadeykins
3c2f36759b
Readds deaf
2019-02-06 18:50:23 -07:00
Kyep
420ff9f540
prevent possible really rare runtime
2019-02-06 04:39:24 -08:00
Kyep
3a530cb039
remove all age-based weighting in head job selection
2019-02-06 04:37:54 -08:00
Kyep
84451f8e48
Reduces captain ageism
2019-02-06 04:26:37 -08:00
Shadeykins
fffe081a8f
Adjusts restrictions to remove deprecated options.
2019-02-04 20:58:34 -07:00
datlo
0ff947ec17
Added golem custom access, boards, and a free KA
...
You must mine for the trigger guard kit before being able to use the KA
2019-02-03 18:27:24 +00:00
Kyep
00187ad971
Updates show player playtime report
2019-02-01 23:46:29 -08:00
Citinited
41ac5e0027
Repath of sexy clown gear: part 1
2019-02-01 21:46:58 +00:00
Kyep
77a1589f75
removes %s
2019-01-11 18:32:15 -08:00
Kyep
fc07fa4798
doubles sec/iaa playtime reqs, adds dept tracking
2019-01-11 18:21:33 -08:00
Kyep
bf9d0b088f
merge conflict fix, reset map
2019-01-07 16:37:07 -08:00
variableundefined and GitHub
b3d27c7202
Merge pull request #10584 from datlo/removeuplinkmanagement
...
Replaces uplink management by automated sharing + various misc outfit changes
2019-01-06 16:14:59 +08:00
Kyep
7abfdaa49a
increase min hours to play trader to 20
2019-01-03 15:31:47 -08:00
datlo
61c0f71cce
Replaces uplink management by automated sharing
...
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
datlo
e18eaf363d
Refactor grey wingdings and add translator implant
...
also change mutadone not to remove roundstart genes
2019-01-01 15:20:46 +00:00
datlo
b0f60602a8
MERGE SHIT REEEEE IMMAH PUNCH A WALL
2018-12-18 11:47:29 +00:00
variableundefined and GitHub
39063d7363
Merge pull request #10421 from Tayyyyyyy/readonly_sechud
...
Add read only sec hud
2018-12-12 15:10:04 +08:00
tayyyyyyy
90453ee42a
Revert "Replace IA bowman headset with normal headset"
...
This reverts commit e71696df8f
2018-12-11 22:31:19 -08:00
Mark van Alphen