cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,879 Commits 26 Branches 2 Tags
ea07c3b06b68a6d8d241be20506a7e2cb3413ce4
Commit Graph

7916 Commits

Author SHA1 Message Date
VampyrBytes
ea07c3b06b several fixes inc #233 
Fixes icon creation issue in certain situations such as humanising
monkeys and cloning
Fixes humanized monkeys reverting to monkey name after being used for
cloning
Fixes humanized monkeys being made as human parent object instead of
human/race
 2014-08-01 06:38:01 +01:00
ZomgPonies
f900578f25 Merge pull request #348 from VampyrBytes/master 
Spacepod movement fix
 2014-07-31 00:58:45 -04:00
ZomgPonies
742bc8c9b3 Merge pull request #345 from SamCroswell/master 
Alien Tweaks, Commented Out Detomatix
 2014-07-30 22:59:12 -04:00
SamCroswell
94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
VampyrBytes
9b08b90ab0 Spacepod movement fix 
Fixes spacepods not being able to move when the gravity generator goes
down
 2014-07-30 05:46:47 +01:00
ZomgPonies
1bd2acf0d0 Revert "More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues." 
This reverts commit 95b069b7d4.
 2014-07-30 00:16:53 -04:00
mwerezak
ac3c812f28 Fixes chest not being coloured by necrosis 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
 2014-07-30 00:16:16 -04:00
Zuhayr
95b069b7d4 More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues. 2014-07-29 14:44:34 -04:00
Zuhayr
a7ffa5747b Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 14:44:15 -04:00
ZomgPonies
8c228fcc87 Trying to stop facehuggers being badass 2014-07-28 21:56:27 -04:00
ZomgPonies
be8da47760 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-28 13:52:51 -04:00
ZomgPonies
fe5db3f538 Merge pull request #335 from Bone-White/master 
Spec Ops Shuttle Computer Access Fix
 2014-07-28 13:52:25 -04:00
Zuhayr
0e3e46e310 Fixes some transposed values. 2014-07-28 13:49:37 -04:00
Zuhayr
d1059b488b Bevy of newhydro fixes. 
Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi
 2014-07-28 13:49:18 -04:00
Loganbacca
0affd2b7c8 More train fixes 
- No passing plastic flaps
- Only human based mobs can board trains
- Adjacent checks for exiting vehicles
- Cleaned up as many direct loc moves as possible
- Places removed cells in the removers hand
 2014-07-28 13:34:50 -04:00
Bone White
d15d6bb742 Minor surgery typo "exposing the brain help within" 
Fixed a typo in organ_external
 2014-07-27 21:37:33 +01:00
JimTheCactus
7304682f62 Changes check to an isnull rather than a truth test 
This allows the client to detect the difference between a blank and someone pressing cancel.
 2014-07-27 14:44:05 -04:00
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
Bone White
0aebd8afa3 Spec Ops Shuttle Computer Access Fix 
Gives the shuttle controller the correct access for the ERT
 2014-07-27 17:30:22 +01: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