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

840 Commits

Author SHA1 Message Date
Fox-McCloud
5bb851b771 Pass II 2015-09-04 16:32:18 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Fox-McCloud
7c29e59784 Materialized Datums 2015-09-04 01:40:06 -04:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Fox-McCloud
9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings 
Progress bars
 2015-09-01 16:45:10 -04:00
Fox-McCloud
d829e7003a Merge pull request #1913 from Markolie/lawmanager 
Port Bay's silicon law manager
 2015-09-01 16:41:55 -04: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
b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-08-31 02:23:24 +02:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Markolie
1cc4f7f483 Add syndicate stamp 2015-08-30 22:52:31 +02:00
TheDZD
a00b878779 Merge pull request #1856 from Fox-McCloud/rnd-lockboxes 
R&D Lockbox Origintech
 2015-08-26 22:05:56 -04:00
Fox-McCloud
52df4c6a33 Fixes Max Research Levels 2015-08-25 21:59:51 -04:00
Fox-McCloud
110abbda59 R&D Lockbox Origintech 2015-08-25 21:24:09 -04:00
Markolie
4cc6192783 Fix robotics console admin message 2015-08-25 19:31:38 +02:00
Fox-McCloud
fd01044d16 Merge pull request #1833 from Markolie/T34-IPC 
IPC organs are now printable, shuttle console ghost access
 2015-08-24 16:55:05 -04:00
Fox-McCloud
d2396dc725 Emitter Fix 2015-08-24 02:26:50 -04:00
Fox-McCloud
0bd980b6d1 Producible Emitter Boards 2015-08-23 15:54:51 -04:00
Markolie
1a16f807e0 Let robotics print IPC organs 2015-08-23 21:05: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
9f6cc85d7a Bug fixes 
- Fixes not being able to put multiple items into a processor.
- Fixes monkey recycler design having the same ID as the smartfridge.
 2015-08-22 14:02:41 -04:00
DZD
32c849a1d5 More buildables, some fixes, upgradable smartfridge 
- Fuel is now available in the tier 4 reagent list for buildable chem
dispensers.
- Seed extractor, gibber, and recycler can be built, but having better
stock parts has no effect.
- Smartfridge can hold up to 1500 items by default instead of 999,
upgrading matter bin allows it to hold more.
 2015-08-21 20:06:23 -04:00
Mark van Alphen
f70f75704d Merge pull request #1796 from Fox-McCloud/detective-scanner 
Detective Scanner Protolathe Production
 2015-08-21 17:19:06 +02:00
DZD
5ce49bb3b3 Machine Upgrade Update 
- Partial port of tgstation/-tg-station#9813
 2015-08-20 21:03:19 -04:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Fox-McCloud
d623c97741 Detective Scanner Protolathe Production 2015-08-19 18:16:52 -04:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
TheDZD
625813286c Merge pull request #1699 from Markolie/rndserver 
Fix RnD server deconstruction
 2015-08-10 10:54:08 -04:00
Markolie
627c50c76b Fix RnD server deconstruction 2015-08-10 16:20:56 +02:00
TheDZD
aadd7a4d9e Merge pull request #1675 from Fox-McCloud/welding-gas 
Adds in Welding Gas Mask
 2015-08-09 19:31:53 -04:00
Fox-McCloud
170ef64412 Adds in Welding Gas Mask 2015-08-08 16:17:11 -04:00
DZD
6e4cb0dc41 Catergory fix for protolathe 
Fixes the category for the advanced plasma cutter and the sonic
jackhammer.
 2015-08-08 16:14:10 -04:00
Fox-McCloud
c3ad070066 Ports over Airhorns 2015-08-06 00:42:17 -04:00
Fox-McCloud
212a0ef643 Imprinter Runtime Fix 2015-08-04 21:13:20 -04:00
Fox-McCloud
82f62da60f Merge pull request #1604 from TheDZD/helper 
Subtypesof Helper Proc
 2015-08-03 17:44:01 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04: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
Markolie
2c1d0ea7d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-08-01 19:41:11 +02:00
DZD
ba82f03d7c Drill and drone fixes 
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
 2015-08-01 10:13:54 -04:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie
f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02: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
DZD
51eca017ad Fixes based on feedback 2015-07-29 18:39:54 -04:00
DZD
ab29813d4c Removes MRSPACMAN Generator 
This used one of the Bay metals as a power source, I removed the actual
machine but forgot to remove the design and board. Whoops. Also, fuck
people setting object paths as strings instead of actual paths.
 2015-07-29 17:32:06 -04:00
Markolie
69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
DZD
3ed90434e0 Projectile, borg, and RnD fixes. 2015-07-10 21:36:23 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
d4cf433e7c Various fixes, changes, additions, and removal of old features. 
More changes
 2015-07-10 19:41:27 -04:00
TheDZD
13f01232c9 Merge pull request #1480 from Fox-McCloud/qdel-the-dels 
The Great Del() Cull of 2015
 2015-07-09 22:37:43 -04:00
DZD
1202538dc5 Actually compiles 2015-07-09 19:26:41 -04:00
DZD
916f9bf4bb Sort of compiles 
Time to fix xenoarch, and then the map.
 2015-07-09 15:55:36 -04:00