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

1625 Commits

Author SHA1 Message Date
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
Markolie
7dbd45857a Fix cult sacrifice objective 2015-07-26 06:06:04 +02:00
Fox-McCloud
eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD
66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master 
Fix OneHuman law
 2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
Fox-McCloud
fde654557c Minor Uplink Cost Adjustments 2015-07-18 21:54:32 -04:00
Fox-McCloud
728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
TheDZD
fbbceac377 Merge pull request #1499 from Fox-McCloud/blob-update 
[Ready To Merge!]Blob Mode Major Overhaul
 2015-07-16 20:34:08 -04:00
DZD
29e70854e9 Fix merge conflicts 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
 2015-07-15 22:28:12 -04:00
Fox-McCloud
6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Fox-McCloud
04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
Fox-McCloud
898bcea1e8 Merge pull request #1489 from FalseIncarnate/master 
Kitchen Machine Refactor and Max Item fix
 2015-07-11 22:19:07 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
FalseIncarnate
8a8011acbf Kitchen Machine Refactor and Max Item fix 
Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code

Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)

Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value

Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
 2015-07-10 09:46:30 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
DZD
916f9bf4bb Sort of compiles 
Time to fix xenoarch, and then the map.
 2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys() 
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
 2015-07-06 09:20:39 -07:00
TheDZD
893e5a91c9 Merge pull request #1449 from Fox-McCloud/side-effects 
Removes Unused/Non-functional Medical Side-Effects
 2015-07-05 17:51:09 -04:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
Fox-McCloud
c5c66a0f06 Merge pull request #1439 from SamCroswell/martialarts 
Swaps Weaken Values, Fixes Span Bug
 2015-07-04 01:46:48 -04:00
SamCroswell
45b89de37e Swaps Weaken Values, Fixes Span Bug 2015-07-03 01:03:59 -04:00
Fox-McCloud
a569c898e9 tweak 2015-06-30 21:24:26 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud
c2567b92a8 Merge pull request #1414 from SamCroswell/martialarts 
Thunderdome and Admin Room Changes
 2015-06-30 16:55:10 -04:00
SamCroswell
4301223201 Fixes Icon Override 2015-06-29 17:50:01 -04:00
SamCroswell
47c633a547 Adds the bo staff and a new martial art 2015-06-29 15:57:13 -04:00
Fox-McCloud
af2410c3f8 Fixes Pizza Bomb Pathing 2015-06-28 18:56:02 -04:00
TheDZD
7ed0902b4f Merge pull request #1374 from Robertha89/patch-1 
Supply crates medical
 2015-06-24 21:26:57 -04:00
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
Robertha89
9573213bab revert viro access 2015-06-24 01:27:28 +02:00
Robertha89
733368a101 Supply crates medical 
Adds brute trauma treatment kits to cargo.
Changes access on Virus crate from CMO to Virologist, as the reason it was there in the first place was due to the previous system having virus bottle for direct use, and without being able to feed this virus it can't infect people, maybe.
 2015-06-24 00:48:37 +02:00