cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,832 Commits 26 Branches 2 Tags
b23f424ed1dace2e2f7cbd03f52dd5c8bf5db072
Commit Graph

7898 Commits

Author SHA1 Message Date
JimTheCactus
b23f424ed1 Added check for blank on name entry 
Since cancel just returns a blank this checks for that and doesn't raise an error.
 2014-07-27 14:43:53 -04:00
ZomgPonies
9969b6d33e Jukebox radio fixes 2014-07-27 13:49:50 -04:00
Rob Nelson
ac0c864603 Added and completed radio broadcasting system. 
Conflicts:
	code/modules/media/broadcast/transmitters/broadcast.dm
	code/modules/media/jukebox.dm
	icons/obj/radio.dmi
	maps/tgstation.dmm
 2014-07-27 12:46:46 -04:00
ZomgPonies
d61776a1c3 Merge pull request #333 from SamCroswell/master 
Minor Map Fixes
 2014-07-27 12:00:40 -04:00
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
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
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
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
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
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
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
Zuhayr
13797e99ed New machines, adjusted Cael's seeds, rewrote space vines. 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
 2014-07-25 10:06:19 -04:00
Rob Nelson
4c32f5f946 Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix. 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/atoms_movable.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/nano/nanomapgen.dm
 2014-07-24 21:01:49 -04:00
Rob Nelson
de17dce900 Nothing to see here. 2014-07-24 20:54:59 -04:00
ZomgPonies
c0c3262d9b Compile fix 2014-07-24 19:10:36 -04:00
Loganbacca
936ad57e83 Cargo train fixes 
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
 2014-07-24 18:44:12 -04:00
Loganbacca
0e9e9fe596 Cargo train update 
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates

Conflicts:
	code/datums/supplypacks.dm
	code/modules/vehicles/cargo_train.dm
	icons/obj/vehicles.dmi
 2014-07-24 18:43:13 -04:00
DJSnapshot
c4a06ef7c1 temporary fix for #4907 2014-07-24 18:39:24 -04:00
DJSnapshot
be6f4b74a8 Updates to gun targeting UI. Fixes #5710 
Conflicts:
	code/_onclick/hud/human.dm
	code/modules/client/preferences_toggles.dm
 2014-07-24 18:36:52 -04:00
mwerezak
e180bcc2f3 Fixes icons not being updated for necrosis 2014-07-24 18:30:15 -04:00