cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

875 Commits

Author SHA1 Message Date
Markolie
ed9a63763e More event tweaks 2015-09-17 22:25:35 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Fox-McCloud
e3a6bf535f Powernet Datum Destroying 2015-09-14 21:54:21 -04:00
Tigercat2000
0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes 
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
 2015-09-07 11:51:00 -07:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Fox-McCloud
9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings 
Progress bars
 2015-09-01 16:45:10 -04:00
Fox-McCloud
2b6e574587 Merge pull request #1891 from Markolie/eyes 
Mechanicals eyes update
 2015-09-01 16:41:42 -04:00
Markolie
3898ba87a7 Robotic eyes will not protect your from welding/the supermatter 2015-09-01 19:13:17 +02:00
Tigercat2000
7f4ac72910 Progress bars + Wall Rationalization 
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
 2015-08-31 13:38:51 -07:00
Markolie
182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-08-30 00:38:03 +02:00
Markolie
134d2116c6 Makes mechanical eyes protect you 2015-08-29 18:38:26 +02:00
Markolie
290b9fafa5 Update mecha weapons/emitter logging 2015-08-29 01:55:45 +02:00
Markolie
9839376ca0 Properly sortAtom the machines 2015-08-28 23:56:52 +02:00
Markolie
2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Fox-McCloud
16c17d3e8e Reduces Powernet Lag 2015-08-25 17:46:20 -04:00
Markolie
93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00
Fox-McCloud
a53451c243 Merge pull request #1813 from TheDZD/muhcheens 
Machine Upgrade Update
 2015-08-23 00:35:18 -04:00
DZD
5ce49bb3b3 Machine Upgrade Update 
- Partial port of tgstation/-tg-station#9813
 2015-08-20 21:03:19 -04:00
Markolie
e6c331153a Add option to reject adminhelps 2015-08-20 23:33:09 +02:00
Fox-McCloud
f635d9c054 Merge pull request #1778 from Markolie/events 
Revenant update, event weight tweaks
 2015-08-19 17:04:14 -04:00
TheDZD
2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace 
IPC overhaul
 2015-08-19 11:57:04 -04:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus 
Admin teleport update, further admin message fixes
 2015-08-18 20:19:55 -04: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
Markolie
a8f8fb160a Revenant update 2015-08-18 18:29:45 +02:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +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
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Mark van Alphen
6abb1f8730 Merge pull request #1754 from tigercat2000/log_to_dd 
New proc to replace world.log <<, log_to_dd()
 2015-08-16 17:49:00 +02:00
Markolie
d607739078 Final IPC fixes (hopefully) 2015-08-16 03:43:20 +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
3285aadaba Vox heist left behind fix 2, robot checks for APC's/alarms 2015-08-14 06:38:51 +02:00
Markolie
5e95ae82b4 Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update 2015-08-14 06:26:40 +02:00
Markolie
f1a4cf1dcf SMES (de)construction fixes 2015-08-12 22:14:47 +02: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
c9ecbfd5d8 Merge pull request #1628 from Markolie/master 
Fix cable coil sprite
 2015-08-03 01:15:36 -04:00
Markolie
f213cf5501 Fix cable coil sprite 2015-08-03 06:37:12 +02:00
Markolie
2e3f4c63dd Solar control initialization fix 2015-08-03 01:14:06 +02:00
Markolie
b1b2f4ae92 Compile error fix 2015-08-03 00:58:10 +02: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
Markolie
62f2f64063 Make SMES start empty, GC fix 2015-08-02 22:45:25 +02:00
Markolie
2a824c5fe0 Tweak electrocution damage from power gloves, GC update 2015-08-02 19:10:31 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
38b313a454 Engineering outpost solar update 2015-08-01 22:25:32 +02:00
Markolie
aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
 2015-08-01 21:44:47 +02:00