cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,011 Commits 28 Branches 2 Tags
bca7ff054e98ef4cd1a5204c96202df31f5bb4c8
Commit Graph

3184 Commits

Author SHA1 Message Date
SkyMarshal
cf89bbed1b ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map. Some cleanup to the code, and added scaling and sanity to air movement so that stuff isn't pants on head retarded. 2012-08-11 00:50:19 -07:00
headswe
79412c9a75 Merge pull request #1588 from CIB/suit 
Moved the captain's suit
 2012-08-10 09:19:53 -07:00
headswe
8103abcd9f Merge pull request #1583 from CIB/cib 
Full wound system rewrite - Tested and ready to merge
 2012-08-10 09:18:28 -07:00
Cael_Aislinn
77d031b230 removed false positive, doubled zas debug sensitivity 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 12:11:21 +10:00
Cael_Aislinn
b805dce8e1 additional zas debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 11:06:27 +10:00
Cael_Aislinn
3b9acf1c9e replaced log_admin with log_adminwarn, so hopefully the messages will output to server 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 01:41:17 +10:00
Cael_Aislinn
dca3f3bd8a reworked/verbosified some zas debugging, added additional zas debugging, made kill_air available to game_admins as well as game_masters, increased runtime check sensitivity to aid in debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 18:12:59 +10:00
Cael_Aislinn
2abbd8ce6b compile fix, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:53:29 +10:00
Cael_Aislinn
ab0fe32f84 additional debugging tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:49:18 +10:00
Cael_Aislinn
34000482c7 additional zas debugging, kill_air output made a bit more informative 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:42:26 +10:00
Cael_Aislinn
d817bbb490 more verbose zas debugging, decreased runtime sensitivity by half again, and reset the counter every time a tick is successful 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 03:19:50 +10:00
Mloc
0d94175887 Merge pull request #1585 from comma/master 
Surgery fixes and tweaks
 2012-08-08 06:44:45 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
 2012-08-08 13:21:47 +04:00
cib
6b6d037b51 Fixed a few mistakes with captain's suit storage unit. 2012-08-07 03:01:46 -07:00
cib
8ee4280e73 Moved the captain's space suit to a secure position in EVA. 2012-08-07 02:33:30 -07:00
cib
5785c817f8 Added a few hacks to make wound processing happen less often. 2012-08-07 00:01:40 -07:00
CIB
0021fe1f49 Nerfed changeling absorb objectives to 2-4 2012-08-06 15:24:50 -07:00
cib
cc2aaf1731 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm
 2012-08-06 15:18:27 -07:00
cib
9b9d541a25 Fixed response_team.dm indentation. 2012-08-06 13:43:39 -07:00
cib
f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm
 2012-08-06 13:36:26 -07:00
CIB
fafe55632b Merge pull request #1582 from FireFishie/hat2 
Captain's cap is now a hat
 2012-08-06 12:52:04 -07:00
cib
0c67bc7439 Restructured the organ wound system. 
Wounds are now datums rather than pure text, which means wound descriptions in examine will now always be in line with the actual damage of the mob.
 2012-08-06 12:51:18 -07:00
comma
2e6da1ab7a Surgery changes. 
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 19:07:48 +04:00
cib
7be97d0d9f Updated response team fluff 2012-08-06 13:42:31 +02:00
FireFishie
9b4cdb357e Captain's cap is now a hat 
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
 2012-08-06 06:50:31 -04:00
Cael_Aislinn
bc58cbe6a3 fix for announcement bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 17:21:46 +10:00
Albert Iordache
27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert 
Conflicts:
	code/game/mecha/mecha.dm
 2012-08-04 22:48:25 +03:00
Cael_Aislinn
6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:58:53 +10:00
Cael_Aislinn
8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:00:59 +10:00
Cael_Aislinn
93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 19:23:40 +10:00
Cael_Aislinn
46a450069e - simple_animals can't open doors by default 
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:47:56 +10:00
Cael_Aislinn
0b14f97af0 hardcap for vermin spawning (30, editable via gameticker) 2012-08-04 15:44:02 +10:00
CIB
9fa25a84ce Merge pull request #1563 from FireFishie/belts 
Added some belt storage options
 2012-08-03 14:06:13 -07:00
Cael_Aislinn
4a460f24f3 compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 04:07:54 +10:00
Cael_Aislinn
2f634cc081 limit vermin to 30 (can be edited in the gameticker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 03:53:28 +10:00
Cael_Aislinn
7401f53d75 tweaks to vermin spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 03:41:59 +10:00
Cael_Aislinn
388d0b9be0 some tweaks to vermin spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 02:06:26 +10:00
Cael_Aislinn
223cee4aa3 fix for non-working shutters and blast doors on exodus and antiqua 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 01:42:03 +10:00
Cael_Aislinn
3f4d2500f6 holding exact required credits will now bring success 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:25:09 +10:00
Cael_Aislinn
1c2bb7e750 fixes to vermin spawning, replaced rag spawners in map with actual rags 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:21:43 +10:00
Cael_Aislinn
d20a7a50f1 compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:56:45 +10:00
Cael_Aislinn
7fce61598a new traitor objective to steal money 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:49:01 +10:00
Cael_Aislinn
baac6fe04c fix for kobold doing stuff while dead 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:17:34 +10:00
Cael_Aislinn
f8e0f5a925 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-08-03 15:06:02 +10:00
CIB
a1d362b795 Fixed custom votes 
The old method of passing the voter as href was still used by custom votes, making Topic() believe anyone doing custom votes was cheating. Thank god there was no auto-ban.
 2012-08-03 05:43:39 +03:00
FireFishie
a13e620abe Added some belt storage options 
-Medical, security, and tool-belts may now hold any type of lighter
-Medical belts may now hold latex gloves and sterile masks
-Security belts may now hold gas masks
-Tool-belts may now hold cigarette packs
 2012-08-02 15:26:24 -04:00
Cael_Aislinn
e9d68bd249 vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:39:00 +10:00
Cael_Aislinn
3c168305ed reworked equip_if_possible to be a bit better 2012-08-02 14:33:00 +10:00
Cael_Aislinn
7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 04:56:48 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters 
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
 2012-08-02 03:22:44 +10:00