cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,494 Commits 5 Branches 0 Tags
5fee41d4ba4aa72ad9008fd1fdffdb62491d2015
Commit Graph

10523 Commits

Author SHA1 Message Date
Loganbacca
54971c1bf5 Projectile effects - Part 1 
- Added base projectile effects framework
- Added vector movement helper
- Added temporary effect sprites
 2015-03-09 22:17:06 +13:00
GinjaNinja32
bbae1a49e5 Fixes vines spreading through doors 2015-03-09 09:04:22 +00:00
Chinsky
5b7368e627 Merge pull request #8386 from volas/heartbeat 
Heartbeat sound
 2015-03-09 11:45:10 +03:00
mwerezak
a28378f819 Fixes space movement runtime 2015-03-09 03:32:18 -04:00
mwerezak
17780e196a Fixes medical record cabinet runtime 2015-03-09 03:18:38 -04:00
mwerezak
4c7138db14 Adds four mercenary vests to the merc base, tweaks 2015-03-09 03:15:45 -04:00
mwerezak
5abf0248fc Firing the Z8 grenade launch automatically switches back to regular firing. 2015-03-09 03:14:26 -04:00
mwerezak
0b5575897d Updates maint drone helptext 2015-03-09 02:34:21 -04:00
mwerezak
e5a9b686aa Fixes human examine 
Fixes issues introduced with the examine tab system by decoupling the
examine() proc from the code that updates a mob's description holders.
Puts a few things in more logical places.
 2015-03-09 02:33:43 -04:00
mwerezak
b71f6c1121 Partial breathing refactor 
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
 2015-03-09 00:09:34 -04:00
PsiOmega
cfbba5c153 Station alert monitor should now only react to major alarms. 2015-03-08 17:58:48 +01: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
PsiOmega
44c7b2367a Admin verbs and white/blacklisting or races. 
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
 2015-03-08 12:25:34 +01:00
GinjaNinja32
9888120b05 Fix simple-animal grabbing 2015-03-08 11:21:38 +00:00
Chinsky
db450303c4 Merge pull request #8379 from Neerti/3-6-2015_help_text_weapons 
Examine Tab Text: (Some) Weapons
 2015-03-08 10:57:36 +03:00
PsiOmega
c6b0370b6a Mirror and ERT appearance improvement. 
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
 2015-03-07 23:11:00 +01:00
volas
cef52c73f8 Heartbeat 2015-03-07 18:03:49 +03:00
Chinsky
64f42d592c Gave Runtime spirit-sensing capabilites. Every tick there's a 2% chance she'd stare at a place where ghost is. 2015-03-07 16:48:21 +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
Chinsky
b730e8309e Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance. 2015-03-07 16:03:43 +03:00
Chinsky
fae7d1c9e9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge 
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-07 15:18:54 +03:00
Neerti
a49dcb2470 Adds help text and some antag text to common weapons. Makes chameleon gun change proc play nice with multiple definitions. Rest of chameleon stuff will be changed later when I get around to it. 2015-03-06 23:40:50 -05: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
Graham Lloyd
7420463f73 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-03-04 05:15:27 -05:00
Graham Lloyd
160183ebd5 finishes work on adapting the goon process scheduler for BS12. 2015-03-04 05:14:36 -05: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