cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 22:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,919 Commits 28 Branches 2 Tags
58253b23ce8aefec59de80faae183ee59a7c2ee9
Commit Graph

790 Commits

Author SHA1 Message Date
Robertha89
36115ed8aa Disregard that 2015-09-30 21:23:43 +02:00
Robertha89
f07a82936f Magical SMES for consistancy 2015-09-30 21:22:43 +02:00
Robertha89
1a463b75f0 Reduce starting power 2015-09-30 21:21:10 +02:00
Robertha89
7184df0aac Fixes Name issue and gives engineering more power 
Very often now, this is how the round starts, power starts going out, engineers does nothing, nobody does anything, and there are so many rounds where the power runs out station wide, i.e it takes an hour to set up power, this will buff the starting power of engineering, so that power does not start running out during the first half hour of the shift.

Also, fixes the name back to SMES.

This can be considered a somewhat controversial pull.
 2015-09-30 01:06:25 +02:00
Mark van Alphen
9c68c2baaf Merge pull request #2175 from Fox-McCloud/fixup 
Spacemove Fixup
 2015-09-26 23:53:50 +02:00
Mark van Alphen
6f9ce5d65c Merge pull request #2164 from Fox-McCloud/gas-turbine 
Gas Turbine
 2015-09-26 21:27:11 +02:00
Fox-McCloud
d57d42e8dd Spacemove Fixup 2015-09-26 02:36:44 -04:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update 
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
 2015-09-25 15:53:59 -07:00
Fox-McCloud
d5a6959c27 Gas Turbine 2015-09-25 05:23:05 -04:00
Fox-McCloud
810784c8ac qdel() dem powernets 2015-09-21 01:17:12 -04:00
Fox-McCloud
bd3696523b GC a few Datums 2015-09-20 22:40:13 -04:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
TheDZD
7e9b2f99b1 Merge pull request #2091 from Fox-McCloud/destroy-them-all 
Fixes up a few Destroys
 2015-09-18 22:30:49 -04:00
Fox-McCloud
56ed8c1a7e Pass III 2015-09-18 21:15:08 -04:00
Fox-McCloud
74565c101b Fixes up a few Destroys 2015-09-18 04:20:02 -04:00
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