cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,241 Commits 10 Branches 0 Tags
c7573a0d11a37dc2dfd14699a30a8bb687fe2eb8
Commit Graph

10402 Commits

Author SHA1 Message Date
volas
c7573a0d11 Antag-OOC 2015-03-09 12:19:50 +03:00
volas
2ad8d26aeb Play server sound verb for admins 2015-03-09 12:19:47 +03:00
Chinsky
5b7368e627 Merge pull request #8386 from volas/heartbeat 
Heartbeat sound
 2015-03-09 11:45:10 +03:00
Zuhayr
a508651115 Merge pull request #8381 from comma/mindfuck 
More hallucinations mindufuckery
 2015-03-09 03:23:36 +10:30
volas
3d55fc58b9 Additional checks for heartbeat, reduced volume 2015-03-08 19:27:31 +03:00
volas
cef52c73f8 Heartbeat 2015-03-07 18:03:49 +03:00
Chinsky
f3b6c65038 Added new hallucinations effect - spinning. Changes client dir for 3-5 second for a /real/ mindbreaking. Minor sprite oddities that appear in that mode shouldn't be an issue if you are hallucinating and only last for few seconds anyway. 2015-03-07 16:23:31 +03:00
Zuhayr
3895349787 Merge pull request #8374 from Baystation12/dev-freeze 
Dev freeze into dev
 2015-03-07 12:05:32 +10:30
Zuhayr
ac860b976a Fixing compile issues, adjusted buckle code after a weird merge. 2015-03-07 11:52:14 +10:30
Zuhayr
9f1e04aa50 Thanks TortoiseGit. 2015-03-07 11:40:00 +10:30
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
PsiOmega
0262ab0de0 Runtime fixes 
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
  source file: statistics.dm,87
  usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
  src: null
````

````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
  source file: statistics.dm,52
  usr: null
  src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
  source file: helpers.dm,16
  usr: null
  src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
  source file: nanoui.dm,419
  usr: null
  src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
  source file: mob.dm,862
  usr: null
  src: the monkey (643) (/mob/living/carbon/monkey)
````
 2015-03-06 18:39:44 +01:00
Chinsky
07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite 
Edits Z8 desc
 2015-03-06 11:56:31 +03:00
mwerezak
875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
Chinsky
f064305a7b Fixes #8268 2015-03-06 07:11:19 +03:00
Daniel García Baldomir
94477bd66c Minor fixes on the overlays. Made holosigns functional again. 2015-03-05 21:47:26 +01:00
ccomp5950
ebabf53c6d Staff now have a "re-admin self" button after de-admining themselves. 
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
 2015-03-05 11:05:58 -05:00
mwerezak
3bf5a5ca99 Updates storage costs 
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
 2015-03-05 10:40:25 -05:00
PsiOmega
3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
 2015-03-05 09:20:20 +01:00
PsiOmega
173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
 2015-03-05 08:05:44 +01:00
Zuhayr
5e90eba7d7 Merge pull request #8347 from PsiOmegaDelta/PushItHarderBetterStrongerFaster 
An inhabited AI core can now be pushed.
 2015-03-05 12:44:28 +10:30
Zuhayr
c9a2ed84fe Merge pull request #8352 from PsiOmegaDelta/LessEdits 
Mappings.
 2015-03-05 09:20:03 +10:30
Zuhayr
b4b43a6206 Merge pull request #8350 from PsiOmegaDelta/NanoRuntime 
Fixes NanoUI transfer runtime.
 2015-03-05 09:19:41 +10:30
PsiOmegaDelta
decb9a79eb Merge pull request #8355 from Neerti/2-28-2015_teg_prettyness 
New TEG sprite, NanoUI for TEG, and a runtime fix.
 2015-03-04 20:09:56 +01:00
Raptor1628
cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
Neerti
f229aa479f Adds a bunch of prettiness to the TEG, fixes a runtime. 2015-03-04 09:13:05 -05:00
PsiOmegaDelta
7d3c01c51e Merge pull request #8341 from mwerezak/temperature-fix 
Fixes #7363
 2015-03-04 12:40:54 +01:00
PsiOmegaDelta
6799569d16 Merge pull request #8344 from comma/surgeryfixies 
Surgerything
 2015-03-04 11:00:22 +01:00
Chinsky
198abc02f6 Merge pull request #8345 from PsiOmegaDelta/Triumvirate 
Multiple AIs no longer guaranteed to receive the same ion laws.
 2015-03-04 12:51:31 +03:00
PsiOmega
81b0ab3bcf Mappings. 
Makes specific instances of the engine room air alarm and AI APC.
Includes some map cleanup by Dream Maker itself.
 2015-03-04 10:21:36 +01:00
PsiOmega
05c487ca8f Fixes NanoUI transfer runtime. 
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
 2015-03-04 09:46:49 +01:00
mwerezak
f8831fa513 Adjusts human temperature damage intervals 2015-03-03 19:31:01 -05:00
PsiOmega
25ca1af5d3 An inhabited AI core can now be pushed. 
No longer can an AI chassis no longer suddenly not be pushed once it's been activated.
 2015-03-03 16:18:52 +01:00
PsiOmega
d6d30054c5 Multiple AIs no longer guaranteed to receive the same ion laws. 
Traitor AIs now also get an ion law, to reduce meta.
Ion storm even now picks a random law for each AI.
Non-crew members are no longer eligible targets for ion laws.
Only recently active crew members are now eligible targets for ion laws.
 2015-03-03 15:40:39 +01:00
Chinsky
b0be5a90ff Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time. 2015-03-03 13:37:26 +03:00
Chinsky
c837505e8b Merge pull request #8328 from PsiOmegaDelta/LessIsMore 
Cleans up access handling.
 2015-03-03 10:21:16 +03:00
Chinsky
9be2b8d64c Merge pull request #8330 from PsiOmegaDelta/Access 
Increased check_rights flexibility.
 2015-03-03 10:21:11 +03:00
Snapshot
68d206be6a Merge pull request #8329 from PsiOmegaDelta/Smile 
Fixes #8322.
 2015-03-02 18:36:46 -08:00
mwerezak
1a4cedd412 Fixes #7363 2015-03-02 13:24:52 -05:00
PsiOmega
318f5e1a92 Cleans up access handling. 2015-03-02 18:55:03 +01:00
PsiOmega
98be5cbce8 Synth medical sensors now report dead/alive status. 
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
 2015-03-02 13:04:02 +01:00
PsiOmega
a11c7ba1c7 Fixes #8334. 
Removes references to the load_speed argument in load_map as it doesn't actually exist.
For some reason the dmm_suit injects itself as an argument in airlocks. Putting a band-aid on the symptom.
 2015-03-02 11:42:40 +01:00
PsiOmega
02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
 2015-03-01 21:15:47 +01:00
PsiOmegaDelta
1acfce9b29 Merge pull request #8332 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-03-01 21:14:34 +01:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
Chinsky
a783e7fd52 Merge pull request #8325 from GinjaNinja32/vines 
Properly fixes vines pulling through windoors
 2015-03-01 22:29:21 +03:00
PsiOmega
df689a4f72 Increased check_rights flexibility. 
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
 2015-03-01 15:29:17 +01:00
PsiOmega
bdce7a8e41 Fixes #8322. 
When copying a photo new instances are created of relevant icons, instead of referencing them.
 2015-03-01 15:21:15 +01:00
Snapshot
413b085994 Merge pull request #8323 from PsiOmegaDelta/NanoDistance 
Fixes issue with borg remote access.
 2015-02-28 20:17:36 -08:00
Snapshot
c1108b2ad2 Merge pull request #8318 from mwerezak/hardsuit-emp 
Hardsuit fixes, tweaks, EMP effects
 2015-02-28 20:16:36 -08:00