cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,927 Commits 26 Branches 2 Tags
cd088909b06f2d230e587f60c68fe06dd674048d
Commit Graph

1209 Commits

Author SHA1 Message Date
Fox-McCloud
386ccd9717 Merge pull request #1844 from Markolie/cargonia 
Cargo interface overhaul
 2015-08-25 16:29:56 -04:00
Markolie
6a6f09ed36 Cargo interface overhaul 2015-08-24 19:20:20 +02:00
Markolie
93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00
DZD
0965789925 Fix merge conflicts 2015-08-21 18:38:42 -04:00
Fox-McCloud
64af990d63 Merge pull request #1806 from Markolie/nukegoesboom 
Nuke update
 2015-08-21 16:56:30 -04:00
Markolie
f6c8358fa2 Fix reference to nuke 2015-08-20 21:57:41 +02:00
Markolie
175bea62ca only change alert level on non-syndi nukes 2015-08-20 21:25:07 +02:00
Markolie
4bd4452086 More nuke updates 2015-08-20 19:21:46 +02:00
Markolie
59a86e5711 Make nuclear bomb use wires datum 2015-08-20 18:47:19 +02:00
TheDZD
0c31d41e78 Merge pull request #1792 from Markolie/nano 
NanoUI pod tracker/exosuit console, uplink fix
 2015-08-20 11:50:14 -04:00
DZD
f3970fb304 Wizard touch attacks and fixes 
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
 2015-08-20 10:21:45 -04:00
Markolie
b6a1e52e08 Hopefully fix uplink crashing 2015-08-19 22:22:51 +02:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
 2015-08-18 18:38:59 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus 
Admin jump overhaul, add watchlist functionality, other admin updates
 2015-08-17 18:10:38 -04:00
Markolie
d8b5afeca7 Cult loyalty implant fix 2015-08-17 19:24:21 +02:00
Markolie
52fbcb9e89 Minor consistency changes 2015-08-17 02:23:34 +02:00
Markolie
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Tigercat2000
ca921216fe New proc to replace world.log <<, log_to_dd() 
This commit changes every 'world.log <<' message with a loggable proc-
log_to_dd().

This is adjustable in the config; If LOG_WORLD_OUTPUT is present, all
things sent to world.log will show up in the standard /data/logs/ logs.

These logs will contain the following (in order):
 Timestamp
 "DD_OUTPUT:"
 The message.

The config option for this, by default, is turned off.
 2015-08-14 18:18:57 -07:00
Markolie
ce1bb4c80f Update syndi toolbox description 2015-08-13 21:02:42 +02:00
TheDZD
56af11019a Merge pull request #1708 from Markolie/caching 
Caching
 2015-08-11 17:42:57 -04:00
Markolie
7101ccde02 Further caching updates 2015-08-11 18:28:45 +02:00
Markolie
ebdfeae887 Add caching to air alarms, apcs and power monitoring computers 2015-08-11 15:56:37 +02:00
Markolie
09fc2bc54f Add caching to crew monitor 2015-08-11 15:24:49 +02:00
DZD
93df90d09f Lightning Bolt Buff 
- Now always bounces 5 times (for a total of 6 hits).
- Now always does at least 15 damage per hit, with a maximum of 50.
- Now affects people wearing insulated gloves, tough luck if they're wearing an fully insulated chest-covering armor though.
 2015-08-09 18:58:53 -04:00
DZD
16bdb00351 Nukes useless /wizard/ spell pathing 
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
 2015-08-08 14:06:50 -04:00
TheDZD
70fc864ce8 Merge pull request #1651 from Fox-McCloud/shadowling-surgery-and-fixes 
Shadowling Surgery and Fixes
 2015-08-06 19:21:38 -04:00
Fox-McCloud
46b22da03e Fixes Explosion and Poison Traitor Bottles 2015-08-06 16:55:47 -04:00
Fox-McCloud
5ae43f0875 Shadowling Surgery and Fixes 2015-08-05 21:52:17 -04:00
Fox-McCloud
050e111157 Merge pull request #1603 from TheDZD/shadowling 
Shadowling Updates
 2015-08-05 20:26:25 -04:00
Fox-McCloud
fb381e5d84 Merge pull request #1626 from TheDZD/wiznerd 
Adminboooooooooooooos
 2015-08-03 21:19:21 -04:00
Mark van Alphen
8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms 
Conflicts:
	code/__HELPERS/lists.dm
 2015-08-03 23:59:45 +02:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper 
Subtypesof Helper Proc
 2015-08-03 17:44:01 -04:00
Mark van Alphen
027686ba52 Buff scrubbers and add widenet 3x3 scrubbing 2015-08-03 23:22:25 +02:00
DZD
1a15dbd432 Adminboooooooooooooos 2015-08-03 11:25:37 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms 
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
 2015-08-03 00:04:24 +02:00
Fox-McCloud
7d806cbd12 Merge pull request #1602 from Markolie/powernet 
Powernet rework
 2015-08-02 17:26:37 -04:00
Fox-McCloud
330e5c0c8d Fixes Nuke Ops Energy Sword/Shield Uplink Purchase 2015-08-02 02:11:03 -04:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-08-01 19:35:39 +02:00
DZD
ed24ac47de Up to date with -tg- 
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
 2015-07-31 18:15:45 -04:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Fox-McCloud
0e6a3c36cf Lowers Cost of Clown Grenades 2015-07-30 16:39:43 -04:00
Markolie
660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/power/port_gen.dm
 2015-07-30 03:08:33 +02:00
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2 
Mining Overhaul [Soon™]
 2015-07-29 20:51:24 -04:00
Markolie
c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie
706d19c24f Reference/typo fixes 2015-07-28 17:28:56 +02:00
Markolie
b6e446c446 NanoUI traitor uplink 2015-07-28 06:28:01 +02:00
Fox-McCloud
3ecaadde48 Merge pull request #1571 from Markolie/master 
Fixes
 2015-07-27 11:46:35 -04:00