cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,726 Commits 14 Branches 2 Tags
07435d52d14739ca80302f4145dd2c404c40d99e
Commit Graph
18726 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SamCroswell 07435d52d1 Revert "NeinHaus' warning stripe icons" 
This reverts commit a6a1ac9dc4.
 2014-12-06 11:49:45 -05:00
SamCroswell a6a1ac9dc4 NeinHaus' warning stripe icons 
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
 2014-12-06 11:48:20 -05:00
SamCroswell 2d1f82f94e VERY Minor Map Fixes, Bug Fixes 
The plating in the maintenance bar now has the correct icon when given
tiles.

Borgs can no longer add their modules to carts.

The hand teleporter now recharges properly again.
 2014-12-05 19:08:36 -05:00
SamCroswell 6b3c1454a1 Re-Tagged Engisat 2014-12-04 17:28:52 -05:00
SamCroswell a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
Fox-McCloud 3cd97430df Merge pull request #39 from SamCroswell/master 
Minor Map Fixes - New Costume Preset
 2014-12-04 16:26:45 -05:00
SamCroswell bfc379ccfc Revert "Minor Map Fixes" 
This reverts commit ad053bc7b2.
 2014-12-04 16:24:26 -05:00
SamCroswell ad053bc7b2 Minor Map Fixes 
Broke atmos + disposals to the library, whoops!
 2014-12-04 16:14:30 -05:00
Fox-McCloud 510fb05768 Merge pull request #37 from Markolie/master 
Minor fixes
 2014-12-04 15:13:33 -05:00
Markolie dc8bda43df Remove animated crate from maintenance 2014-12-04 19:50:44 +01:00
Markolie a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
SamCroswell 32661552e9 You cannot use the force, Luke! 2014-12-03 21:48:42 -05:00
SamCroswell 021bc233be Dualsword Inhand Fix, Adds Dark Lord Costume Preset 2014-12-03 21:47:12 -05:00
Fox-McCloud 673ba85ca8 Merge pull request #35 from SamCroswell/master 
Dance Bar Update
 2014-12-03 19:49:28 -05:00
SamCroswell 7a3f19d00f Area Tag Fix, Bar Is No Longer Space 
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
 2014-12-03 19:41:33 -05:00
SamCroswell f1b5476a85 Dance Bar Update 2014-12-03 19:18:00 -05:00
Fox-McCloud 72ecf4ba5e Merge pull request #34 from Fox-McCloud/Production-Tweaks 
Production tweaks
 2014-12-03 18:52:09 -05:00
Fox-McCloud c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
Fox-McCloud b5154cfa16 Merge pull request #32 from Markolie/master 
Re-add stamp images, add more holopads
 2014-12-03 03:52:29 -05:00
Markolie 10e8d20134 Actually unlock the vault to access the nuke during Blob critical mass 2014-12-03 06:07:25 +01:00
Markolie 5f712483dc Missing copier 2014-12-03 06:02:39 +01:00
Markolie 84e8676881 Re-apply my map fixes 2014-12-03 06:00:43 +01:00
Fox-McCloud 99bcd4eebf Merge pull request #7 from ParadiseSS13/master 
Merge from Master
 2014-12-02 23:22:10 -05:00
Markolie c35617f7be Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2014-12-03 05:19:10 +01:00
Fox-McCloud 08e19a32a0 Merge pull request #31 from fj45/master 
Major Overhaul of the Engie sat: Take three
 2014-12-02 23:12:56 -05:00
Markolie 5e3d813c23 Minor fixes 2014-12-03 05:09:36 +01:00
Markolie 0f42e96159 Adds some additional photocopiers 2014-12-03 03:03:02 +01:00
Markolie cb7676c139 Re-add stamp images, add more holopads 2014-12-03 02:53:26 +01:00
fj45 2136ab6d88 Major Overhaul of the Engie sat: Take three 
http://i.imgur.com/CwEjbAk.png
 2014-12-03 08:19:09 +08:00
Fox-McCloud 2483484907 Merge pull request #29 from Markolie/master 
Bot port from /tg/
 2014-12-02 16:53:01 -05:00
Markolie 91d6cda932 Remove luminosity from entertainment monitors 2014-12-02 22:49:14 +01:00
Markolie 47bb8c63bb Syndibot critical fix 2014-12-02 22:40:39 +01:00
Markolie d9376d14d4 Makes the Syndicate outpost air alarms hidden again 2014-12-02 21:19:26 +01:00
Markolie 811939aa52 Mapfix 2014-12-02 20:12:39 +01:00
Markolie 99524f8035 Re-apply map changes 2014-12-02 19:55:02 +01:00
Markolie a83252b492 Merge branch 'master' of https://github.com/Markolie/Paradise 
Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	maps/cyberiad.dmm
	maps/cyberiad.dmm.backup
 2014-12-02 19:49:23 +01:00
Markolie 01ed97b4eb Bot fixes, disease runtime fix, vending menu fix 2014-12-02 19:46:34 +01:00
Markolie dab516174b Gives the AI control over bots 2014-12-02 17:59:40 +01:00
Markolie b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
Fox-McCloud 79125ffb37 Merge pull request #28 from Fox-McCloud/Sprite-Updates 
Sprite Updates
 2014-12-02 09:04:09 -05:00
Fox-McCloud 67f8c7a79a Sprite Updates 2014-12-02 08:49:44 -05:00
Fox-McCloud 42c042f704 Merge pull request #6 from ParadiseSS13/master 
Merge from Master
 2014-12-02 04:14:26 -05:00
Fox-McCloud d63143fc22 Merge pull request #27 from fj45/master 
Upgrade to Secure Storage, take three.
 2014-12-02 04:10:18 -05:00
fj45 728e9c4d8e Upgrade to Secure Storage 
http://i.imgur.com/4w0jxFk.png
 2014-12-02 13:53:42 +08:00
Markolie 048f20d5ca Gives the AI control over bots 2014-12-02 06:52:08 +01:00
Markolie be5b1ea950 Bot port from /tg/ 2014-12-02 06:29:15 +01:00
Fox-McCloud 2957d22caf Merge pull request #25 from SamCroswell/master 
Minor Security Update
 2014-12-01 21:36:46 -05:00
SamCroswell 55e55e7c91 Minor Security Update 
- Fixes seclite inhand, updates to the newer seclite icon.
- Corporate security outfits now spawn with the rest of the security
wardrobe.
 2014-12-01 21:15:27 -05:00
Fox-McCloud 90ea1728a0 Merge pull request #24 from Markolie/master 
Re-add missing Telecomms service server, other fixes
 2014-12-01 18:18:49 -05:00
Markolie 7e98ba2abe Poster ripping fix, allow access to air alarms when set to auto 2014-12-01 23:11:10 +01:00