cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

797 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02: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
Mark van Alphen
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
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
datlo
4ad51dcc59 fix mech runtime 2019-01-04 19:02:39 +00:00
variableundefined
72b237c246 Merge pull request #10530 from datlo/mechvoice 
Adds mecha voice modification kits
 2019-01-04 20:05:36 +08:00
datlo
e0e6689ebf Fix mech grenade launchers 2018-12-29 07:46:06 +00:00
datlo
969a433f97 add syndicate tech requirement 2018-12-29 07:15:38 +00:00
datlo
c12fa7af2b add mech maintenance alert 2018-12-28 07:07:38 +00:00
datlo
c026d533b1 fixed build path error, add power warnings 
also put back attacked_by oof
removed syndicate tech requirement cuz eeeh it's just a voice, replaced
by titanium requirement
 2018-12-27 20:13:22 +00:00
datlo
2625f70d87 added designs to fabricator, changed the check for install 2018-12-27 17:48:56 +00:00
datlo
93a587f354 Add customizable onboard voice sets to mechs 2018-12-27 17:28:16 +00:00
void*
b0a2f86c19 fixed missiles spinning when shot from missile racks 2018-12-27 17:21:27 +01:00
datlo
b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Aurorablade
87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
datlo
0d62b7d07c Syndicate office functional, fix CC mech chargers 2018-12-07 14:45:52 +00:00
Granodd
9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
tigercat2000
e56750481c Multilingualism 
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
 2018-11-24 00:22:05 -08:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works 
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
 2018-11-08 20:24:22 -08:00
warior4356
7c3986be08 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into mecha-drill-fix-2 2018-11-08 01:28:06 -08:00
variableundefined
720938be1c Merge pull request #10073 from warior4356/mech-drill-fix 
Mechs can now drill mechs
 2018-11-08 14:45:18 +08:00
tigercat2000
32c5cb3bbe Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	icons/mob/screen_alert.dmi
 2018-11-04 10:52:50 -08:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
tigercat2000
eea5233d82 Convert phazon damtype to action button (missed thsi whoopsies) 2018-11-02 01:07:50 -07:00
tigercat2000
b370858fc8 Fixes Phazon movespeed, add radial menus to ctrl 
Ctrl Clicking on a mech while you're in it will now bring up a radial
weapon selection
 2018-11-02 00:46:08 -07:00
tigercat2000
d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	code/game/mecha/mecha.dm
 2018-11-01 08:37:46 -07:00
joep van der velden
65675b6c8b spacing! 2018-10-31 19:23:16 +01:00
joep van der velden
f9a9b09616 Put in tigers code 2018-10-31 19:20:48 +01:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
warior4356
890cb79eaf Adds message denying mecha drilling 2018-10-30 21:30:52 -07:00
warior4356
febfdc1325 Makes mecha drillable 2018-10-30 20:58:01 -07:00
farie82
f03aea80f5 Set the repairing to 20 2018-10-30 08:51:29 +01:00
joep van der velden
b5b3fca2af Mechs can now only be repaired once every 1.5 seconds 2018-10-29 20:01:22 +01:00
Squirgenheimer
926c4a5e17 fixes deleting mechs causing a runtime 
-removed unnecessary code handled by detach()
 2018-10-29 01:39:48 -04:00