cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

387 Commits

Author SHA1 Message Date
GinjaNinja32
74f04671f8 His book? Her book. 2015-07-28 13:37:15 +01:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
GinjaNinja32
7eb1e547a3 Better follow code 2015-07-26 10:45:45 +01:00
Mloc
65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight" 
This reverts commit 278a4c38ec.
 2015-07-22 15:14:40 +01:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight 
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-09 19:17:04 +01:00
PsiOmegaDelta
7f24dc948e Re-implements Admin secrets as datums. 2015-07-06 14:58:27 +02:00
PsiOmegaDelta
b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmegaDelta
449c8c8d8f Refactors the ghost_follow_link proc to not use istype checks. 2015-06-10 10:08:17 +02:00
PsiOmega
6f70049a12 Expanded ghost following. 
Ghosts can now follow the Eye of a speaking mob, if it has one, or the body of someone who has died.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1151.
 2015-06-09 16:36:43 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmega
13cb32fa7f Another MayRespawn() fix. 
Being unable to reenter your body now allows you to respawn, even if your body lives.
 2015-06-08 17:39:25 +02:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmega
cbead4224b Fixes #9685. 
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
 2015-06-06 15:44:49 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
PsiOmegaDelta
4a69d0a4f7 More MayRespawn checks. 
Astral projecting wizards/cultists may no longer respawn as something else.
 2015-06-02 13:40:53 +02:00
Atlantiscze
090112c874 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-13 06:17:26 +02:00
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
 2015-05-11 09:28:59 +02:00
PsiOmega
783e437c5e Enforces antagHUD restrictions. 
antagHUD checks were missing in a few places.
Can no longer join as drone, ERT member, or pAI if you have enabled antagHUD.
 2015-05-07 09:55:26 +02:00
Atlantiscze
024dabef7b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-05 22:13:58 +02:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega
a6a9cb76e8 Ghost-possession sanity checks. 
Adds sanity checks referred to in #8849.
 2015-04-15 16:10:36 +02:00
PsiOmega
f9b3547e8d Allow admins to drag-drop ghosts into mobs. 
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
 2015-04-15 08:49:00 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Atlantiscze
4e2769710b Initial Newmalf port 
- Ports TSA Newmalf code.
- Complete overhaul of Malfunction. New modular abilities, 12 of which are in game by default.
- Adds AI hardware. AI may have only one piece and it gives unique boost in certain area (turrets strength, secondary power supply, etc.)
- Adds hardware drivers - these abilities control AI's hardware such as the APU power supply or self destruct explosives.
- Station overtake was changed to "hack all APCs" ability instead. When completed self-destruct is unlocked. Timer for station self destruct increased to 2 minutes. AI may activate/deactivate the self destruct at will.

Please bear in mind this is only INITIAL COMMIT. More commits are to follow. Minimal player count is now set to 1 but will be 2 when finished.
 2015-04-03 23:00:29 +02:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
PsiOmega
1f5de7f64f Ports /tg/ & Paradise ghost sight. 
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
 2015-03-19 16:14:02 +01:00
PsiOmega
018bd4ebdd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-17 12:01:09 +01:00
PsiOmega
cfb3bad3e2 Fixes #8498. 
Simple animals should now die properly when killed.
 2015-03-16 13:46:08 +01:00
PsiOmega
a7a33e0a35 Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-02-03 22:28:53 +01:00
PsiOmega
fb84e5f50a Ghosts now have more sight options. 
Can now toggle between the following modes:
* See other observers + AI eye + darkness
* See only darkness
* No darkness
 2015-01-29 09:11:39 +01:00
PsiOmega
f6b3bfce1c The AI eye now has a sprite. 
Also defines new (see_)invisibility levels for the AI eye, to ensure that cultists visiting the other side cannot suddenly see it while still allowing observers to.
Uses a black and white version of the face hologram as placeholder.
 2015-01-26 22:28:13 +01:00
GinjaNinja32
166e7528fb Fixes monkeyize runtime due to ghostize trying to remove verbs from a non-existent client 2015-01-21 21:07:41 +00:00
Zuhayr
a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr
e74c0c38e4 Fixes #5801 2014-12-24 22:00:31 +10:30
PsiOmega
9c6adfe590 Cult Ghost Manifestation 
Turns out ghosts could be pulled into reality in two places.
This ensures both use the same method.
 2014-12-13 00:13:55 +01:00
PsiOmega
4eb1eb5abc Removes now redundant face_at checks, allows observers to face. 
Was initially an attempt to fix lying mobs being unable to change facing to but https://github.com/Baystation12/Baystation12/blob/master/code/modules/mob/mob.dm#L764 complicates this.
 2014-12-12 12:56:50 +01:00
Amunak
e8c41b38f7 Fixed the message for admins when they use 'ghost'. 
Just for clarity, because I'm bad at English. Props to Omega for the wording.
 2014-12-04 12:58:32 +01:00
Amunak
ab01b270a7 Added missing EOL in observer.dm 2014-12-04 11:51:31 +01:00
Amunak
39c6e3e431 Ghosts/observers now have the option to be anonymous in deadchat. 
It is a ghost-time preference that doesn't get saved. Admins see anonymous ghosts with a * next to their key. People talking in dead bodies are now always seen only with the name of their body (admins see their keys with a ^).
 2014-12-04 11:46:31 +01:00
Amunak
9fe0cdac28 Admins will now receive a prompt to use aghost when they use ghost. 
It replaces the usual prompt that was irrelevant to admins anyway. Adds option for admins to aghost from the ghost prompt.
 2014-12-04 11:35:04 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans 
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
 2014-11-29 16:07:35 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it. 
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
 2014-11-28 13:05:26 +01:00
Amunak
2750092045 The analyze-air verb now shows temperature in Kelvins in addition to degrees Celsius. 2014-11-28 12:24:59 +01:00
GinjaNinja32
21768e4ef1 Allow ghosts to type the parameters to Jump-to-Mob, Follow, and Teleport verbs 2014-11-26 22:39:48 +00:00