20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
a97d050f4b
Syringe Refactor. Overhauls Lethal Injection Syringe
2019-09-30 18:25:36 -04:00
a469d0fcf2
for-God-has-redeemed-us-all
2019-09-30 16:49:15 -04:00
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
d19961378d
first-we-burn-away-the-world-that-was
2019-09-09 14:48:29 -04:00
0119d350b4
Lavaland Update Part 2: Mobs
2019-09-07 02:26:31 -04:00
dca6d98f5f
Refactors Corgis
2019-09-04 18:40:34 -04:00
1dc8e66cbc
Merge pull request #11772 from Couls/constructable-rechargers
...
[READY] Constructable Rechargers and machinery tweaks
2019-08-23 09:16:37 -04:00
a42226c112
Merge pull request #11691 from TDSSS/lavaland-fax
...
Gives lavaland syndie base a fax (+some small other changes)
2019-08-23 08:33:04 -04:00
a0203a60ac
Merge pull request #11965 from TDSSS/talisman-icons
...
Give cult talisman different icons
2019-08-14 19:48:54 -04:00
ee79fc139e
Made update icon less stupid
2019-08-06 01:52:10 +02:00
bbef99ce61
Give cult talisman different icons
2019-08-05 23:01:01 +02:00
268881de5c
Merge remote-tracking branch 'upstream/master' into constructable-rechargers
2019-08-04 21:11:21 -04:00
57c700a814
Sanitize all inputs
2019-07-14 09:35:12 -07:00
d84d2a0b55
Merge pull request #11562 from Tayyyyyyy/markdown
...
Support markdown in papers
2019-07-08 20:20:46 +08:00
fe297fbd93
incorporated kyet's desired changes
2019-07-01 13:07:10 +02:00
cf31a774a5
Rechargers can be built now
...
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
d5af92d346
Initial commit
2019-06-06 14:12:44 +02:00
ef479cb982
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/feet.dmi
# paradise.dme
2019-05-23 19:04:09 +02:00
066343ad31
Support markdown
2019-05-21 13:49:51 -07:00
d61c34e537
Merge pull request #11546 from Shadeykins/Paper-Exploit
...
Fixes paper.dm issue
2019-05-18 16:26:57 -04:00
7249cd84b5
Word choice.
2019-05-18 13:24:35 -06:00
69e50ae70b
Fixes potential paper exploit.
2019-05-18 13:21:38 -06:00
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
d98eb14a39
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
# code/modules/shuttle/shuttle.dm
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-04 03:16:38 +02:00
f3fb39b339
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
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
d646ab0934
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
e0015b69ba
Proper fix (And yes i did forget about this PR)
2019-04-30 22:45:00 +03:00
9024108454
Merge branch 'master' into Camera-spook
2019-04-30 22:00:37 +03:00
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
ad2238f496
Merge branch 'master' into lighting
2019-04-30 19:15:58 +02:00
86d6ee8256
Merge pull request #11356 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-2
...
[s]fixes a couple exploits
2019-04-30 11:39:34 +08:00
4423962a2a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/controllers/subsystem/mapping.dm
# paradise.dme
2019-04-26 23:07:57 +02:00
e4dd9110ee
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# paradise.dme
2019-04-26 22:58:56 +02:00
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +02:00
563a951975
SSevents & SSholiday
2019-04-23 10:55:36 +01:00
a8f5393678
Update clipboard.dm
2019-04-22 22:04:48 +02:00
211468b24f
Add fake ambient occlusion
2019-04-21 01:45:30 +02:00
f94796c125
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# icons/turf/floors/plating.dmi
# paradise.dme
2019-04-10 21:54:54 +02:00
afa4e751db
Merge pull request #11195 from Twinmold93/tonerless_sending
...
Fixes Sending Faxes Using Toner
2019-04-06 03:15:53 -04:00
Fox McCloud