cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-27 18:41:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
ZomgPonies
c1801306a7 Merge pull request #331 from VampyrBytes/master 
fix for customizable foods
 2014-07-27 12:00:09 -04:00
ZomgPonies
89508f7e7f Merge pull request #334 from Bone-White/master 
Advanced Medical Hud Glasses (medihud + flash protection)
 2014-07-27 11:58:42 -04:00
Bone White
abde4759ae Advanced Medical Hud Glasses (medihud + flash protection) 
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
 2014-07-27 16:06:35 +01:00
SamCroswell
ace4d63a8f Minor change, testing some GH commands. 2014-07-27 08:47:29 -04:00
VampyrBytes
a5a7bb2485 Fixes job selection 
Selecting Sec pod pilot will no longer toggle Atmos tec
 2014-07-27 09:43:21 +01:00
VampyrBytes
f78e1c7aeb fixes #295 
Vox syndi ops now start with N2 tank in hand, breath mask and internals
on

Also added N2 canister to syndie ship to allow refilling
 2014-07-27 07:36:05 +01:00
ZomgPonies
eca7dee4dd Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-26 21:34:21 -04:00
ZomgPonies
5a82dd959b Fixed fucking seed vendors 2014-07-26 21:34:10 -04:00
ZomgPonies
63198289dd Merge pull request #329 from SamCroswell/master 
Emagging Ripleys
 2014-07-26 21:32:22 -04:00
SamCroswell
5307a410ce Emagging Ripleys 
You may now emag the Ripley mech to allow guns to be mounted on it. It
does, however, leave an obvious-as-fuck bold red message in the mech's
desc. This will -only- work for the Ripley mech, god help us all if an
Odysseus ever got weapons.
 2014-07-26 19:27:16 -04:00
ZomgPonies
48be906056 Merge pull request #328 from SamCroswell/master 
Added an admin verb to toggle ERTs
 2014-07-26 19:15:57 -04:00
ZomgPonies
d67de71db9 I had removed volatile_fuel, but it somehow came back. Fixed again now. 2014-07-26 19:06:18 -04:00
SamCroswell
075ad2a943 Added an admin verb to toggle ERTs 2014-07-26 18:04:33 -04:00
ZomgPonies
ce856e1f8e Better fix 2014-07-26 17:09:49 -04:00
ZomgPonies
4c1d82d5d4 Blobs break grav gens means no grav 2014-07-26 17:04:12 -04:00
ZomgPonies
f42b67f15a MORE CORES FOR THE BLOB GOD 2014-07-26 16:58:37 -04:00
ZomgPonies
c939be0368 Mech weapon balancing, gamma armory loadout changes. 2014-07-26 16:21:41 -04:00
ZomgPonies
7840276f63 We use a different methodology for respawning as NPCs. 2014-07-26 14:50:24 -04:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
 2014-07-26 14:03:46 -04:00
Zuhayr
5a773dba35 Fixed seeds not showing up properly in the vendor. 2014-07-26 13:55:36 -04:00
ZomgPonies
a830973b74 Commented out some vg procs while I wait for info from Nexis 2014-07-26 12:59:29 -04:00
Rob Nelson
845a90b02c More work on things. 
Conflicts:
	baystation12.dme
 2014-07-26 12:45:28 -04:00
ZomgPonies
99c96c0c9c Let's stay up to date with Zuzu's PR shall we? 2014-07-26 12:04:54 -04:00
ZomgPonies
03f116b8a4 Compile fix 2014-07-26 11:34:50 -04:00
DJSnapshot
b61a4d837f fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-07-26 11:31:40 -04:00
Jarcolr
ff71c6f097 Fixes #5691 
Chef >> Chefhat
 2014-07-26 11:28:15 -04:00
Jarcolr
57051e0160 Fixes #5773 
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
 2014-07-26 11:27:49 -04:00
Walter0o
843d603a0b fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
Conflicts:
	code/game/objects/items.dm
 2014-07-26 11:26:09 -04:00
Walter0o
2e01af4279 fixes nullpointer caused by broken organ list 
the mysterious broken list bug has struck again
 2014-07-26 11:25:05 -04:00
Loganbacca
5f758e2f4f Cargo train fixes 
- Adds overlay for cargo tug sprite
- Fixes failure feedback when successfully loading items on the train
- Stopped unnecessary loading failure feedback (like loading floors on trains, which will always fail)
- Stopped "hit" message when relabeling with the hand labeler

Conflicts:
	icons/obj/vehicles.dmi
 2014-07-26 11:23:12 -04:00
VampyrBytes
b2b443cc4d fix for customizable foods 
names - no more meat, meat and egg sandwich sandwich sandwich type names
- this would now be an egg and double meat triple decker sandwich

commented sandwich.dm out. was almost duplicate code, but if a sandwich
was being made with a shard or customizable food, it was making it a
different object (/food/snacks/csandwich instead of
food/snacks/customizable/sandwich), only thing it processed that the
other didn't was if there was a shard in the food, which is now dealt
with in customizable
 2014-07-26 07:25:47 +01:00
ZomgPonies
46b380d3ba Revert "Revert "Virology Update"" 
This reverts commit 2e1266293b.
 2014-07-25 20:10:10 -04:00
ZomgPonies
ebd8b3ba69 Yeah wut 2014-07-25 18:55:08 -04:00
ZomgPonies
3c8e4db110 Spawn dead clowns with uniforms, uniforms still need a few sprite changes. 2014-07-25 18:45:24 -04:00
ZomgPonies
f1d8804a16 WTF vg, next thing you know you'll be burning down the library. 2014-07-25 18:27:38 -04:00
Heredth
4328993913 Added nazi uniforms. 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
 2014-07-25 18:12:12 -04:00
Heredth
7df1348815 Added officer's coat and soldier's coat. 
Conflicts:
	code/modules/clothing/suits/miscellaneous.dm
 2014-07-25 18:10:10 -04:00
Heredth
4bd8467807 Added Stalhelm, Panzer Cap, and the Officers Cap 
Conflicts:
	code/modules/clothing/head/misc.dm
 2014-07-25 18:07:41 -04:00
ZomgPonies
a1da36611e I AM BEST CODER ARRRGH 2014-07-25 17:47:10 -04:00
ZomgPonies
a89fe94175 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-25 16:29:29 -04:00
Rob Nelson
2873262a07 Recoded wall-smoothing for optimization. Fixes #835. 
Conflicts:
	code/game/smoothwall.dm
	code/game/turfs/simulated/walls.dm
	code/modules/power/singularity/singularity.dm
 2014-07-25 16:29:00 -04:00
ZomgPonies
b2c28397f0 Merge pull request #326 from IcyV/investigate 
Enables the "cult" investigation
 2014-07-25 16:17:32 -04:00
ZomgPonies
2e1266293b Revert "Virology Update" 
This reverts commit 16a9025ef1.

Conflicts:
	code/modules/virus2/effect.dm
 2014-07-25 15:46:24 -04:00
IcyV
acbaa31194 Enables the "cult" investigation 
Exactly as the name says. Makes use of all the investigate_log in place for cult
 2014-07-25 11:57:13 -07:00
ZomgPonies
aa5746b037 Merge pull request #325 from Bram961/master 
Map fixes
 2014-07-25 14:26:31 -04:00
Bram961
4295c1b4fe Map fixes 
-Telescience pad has atmospherics now
-LOTS of minor fixes like airlocks not having their respective
controllers, weird lights, etc etc etc.
 2014-07-25 20:20:38 +02:00
ZomgPonies
bf19e7ac73 PDA investigate fix 2014-07-25 13:52:57 -04:00
ZomgPonies
ed28bc2bd8 Fix botanist spawning with 2 pda 2014-07-25 13:03:46 -04:00
ZomgPonies
dc56dc8958 Investigate PDA messages 2014-07-25 12:32:35 -04:00
ZomgPonies
ed1e3f8bc4 Fixed plasma ore 2014-07-25 11:36:08 -04:00