cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,938 Commits 9 Branches 0 Tags
c9213368492d4f5bd41cd42bc3d1a4d19dabdb0c
Commit Graph

4478 Commits

Author SHA1 Message Date
Erthilo
c921336849 Readded spawn(0) and fixed a silly comment. 2012-06-01 03:29:24 +01:00
Erthilo
014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo
8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
 2012-05-31 15:09:35 +01:00
Albert Iordache
28bc3fa766 Merge pull request #1204 from Aryn/master 
Bugfixes
 2012-05-31 01:50:40 -07:00
Albert Iordache
ecd8e6952d Merge pull request #1202 from Erthilo/master 
Void suit sprites, mutantrace fixes
 2012-05-31 01:45:32 -07:00
Albert Iordache
4891a26a7e Merge pull request #1197 from Uristqwerty/master 
Some unused icon generation code
 2012-05-31 01:43:38 -07:00
Albert Iordache
bf090287df Merge pull request #1196 from SkyMarshal/CoolTweaks 
Some comments, tweaks, and improvements to detective work, evidence bags, and packages.
 2012-05-31 01:42:45 -07:00
Aryn
ac00001399 Made some more airflow changes that are irrelevant until I get airflow working. 2012-05-31 00:25:52 -06:00
Aryn
db79302749 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-31 00:18:44 -06:00
Aryn
8fe372f2d2 Fixed a long-standing temperature bug by correcting the thermal energy calculations. Reduced amount of gas that flows per tick. 2012-05-31 00:14:33 -06:00
Albert Iordache
f7d61de403 Slowed down ZAS depressurization 2012-05-31 07:48:43 +03:00
Erthilo
3d3f49bea1 Fixes mutant races forever lying down. 2012-05-31 01:55:07 +01:00
SkyMarshal
f2b6147432 Whoops! 2012-05-30 16:37:41 -07:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite. 
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-30 15:27:00 -07:00
Uristqwerty
42aa91d6f2 Adding some (currently unused) icon generation stuff 
Basically, a more generalized version of the rune code,
split into more reusable procs. Plus one that generates
a version of an icon that has a neat bluespace effect
applied.
 2012-05-30 17:54:33 -04:00
SkyMarshal
c82b90e24d Some comments, tweaks, and improvements to detective work, evidence bags, and packages. 2012-05-30 13:27:20 -07:00
SkyMarshal
770e09ce5d Merge pull request #1191 from Mloc/varfix 
Huge commit!  Standardizes var definitions in most places.
 2012-05-30 11:07:27 -07:00
Albert Iordache
37dec6e15e Revert "All objects leaving the boundaries of a Z level will now be deleted" 
This reverts commit 606a4a75fe.
 2012-05-30 20:23:25 +03:00
Albert Iordache
606a4a75fe All objects leaving the boundaries of a Z level will now be deleted 2012-05-30 20:14:21 +03:00
Albert Iordache
3e431b0ae0 Removed some ZAS messages sent to the error log 2012-05-30 20:11:18 +03:00
CIB
7e904195f1 Maybe this will fix Tajaran appearance 2012-05-30 20:04:52 +03:00
Mloc
66f633edc0 Fixed some quirks with var standardization, fixed compile error #1190. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-05-30 12:07:13 +01:00
Aryn
da12638dcc Hotfix to update_visuals() to make it compatible with the integer-based checks. 2012-05-30 01:50:58 -06:00
Aryn
354d023a4b Optimized HUD images. 2012-05-30 01:37:52 -06:00
Aryn
37125a42f9 Fixed bugs and optimized ZAS. 2012-05-30 01:33:58 -06:00
unknown
b68b5950a2 No more wanted alerts when someone fails to post a feed story. 2012-05-30 15:05:14 +10:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-05-29 16:26:48 +01:00
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2012-05-29 15:00:11 +01:00
CIB
5f030b1117 Merge pull request #1189 from CIB/master 
Change projectile fix
 2012-05-29 06:46:21 -07:00
Mloc
7da503e2c5 Merge pull request #1188 from sick-trigger/master 
Fixes teleporting with an active chamelion projector
 2012-05-29 06:46:04 -07:00
cib
f3dd3dfe9f The change projectile code is a lovely copypaste again. 2012-05-29 15:45:00 +02:00
cib
3a74270e29 Merge github.com:Baystation12/Baystation12 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
 2012-05-29 13:43:20 +02:00
sick-trigger
83e37be057 Allows you to teleport while disguised as a banana. 2012-05-29 20:31:36 +10:00
sick-trigger
2b43fd81b8 Allows you to teleport while disguised as a banana. 2012-05-29 20:29:54 +10:00
Albert Iordache
604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master 
Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
 2012-05-29 08:50:58 +03:00
SkyMarshal
12392f74dd Merge pull request #1185 from Erthilo/master 
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
 2012-05-28 22:13:53 -07:00
sick-trigger
fb9acbaa08 Actually fixes digging sand messages 2012-05-29 13:56:36 +10:00
Erthilo
41b45396f4 TG: Added a new logging system that can be used for various things in the game (such 
as the singularity engine, AI interactions, anything-else that may be suggested
to me :P).

At the moment it only logs some singularity things. Please let me know if there
are any important methods of singulo-grief which I may have missed.

The "Investigate" verb is available to everyone of rank "Admin observer" and
upwards. Just type "Investigate" and select the subject you'd like to see logs
for. Typing "Investigate singulo" will also work as a shortcut.
Revision: r3679
Author: 	 elly1...@rocketmail.com

TG: Disposal/Pipe Dispenser can no longer be used 'remotely' or while stunned or
while they are unwrenched. Fixes  issue 517 .

Can no longer eject the nuke disk from the nuke while stunned. Fixes  issue 497 .

PA can now be powered down again.

Cyborg 'skull' masks now have east and west facing sprites. Fixes  issue 468 .
- I encourage anyone with actual spriting skills to redo them though, I just
spent 5 second in photoshop whipping these up. (icons/mob/mask.dmi the icon
labeled 'Death')
Revision: r3681
Author: 	 johnsonmt88
 2012-05-29 01:45:03 +01:00
Erthilo
ad382d4e6b TG: -Removed reagent scanners from scientist and RD PDAs and gave the function to 
chemist and CMO PDAs
-Making Heads slightly more headlier. Head offices given more desk space and
given spare PDA carts for their department. PDA Carts are also removed from
equipment lockers.
Revision: r3677
Author: 	 ericgfw...@hotmail.com
 2012-05-29 01:21:18 +01:00
Erthilo
1e022584ac TG: -New PDAs for atmos, genetics, and chemistry 
-New sprites for engineering and medsci PDAs
-Warden area renamed to Armory
Revision: r3676
Author: 	 ericgfw...@hotmail.com
 2012-05-29 01:12:08 +01:00
Erthilo
b3c8cd18c3 TG: -Gave Roboticists morgue access. As a job that handles corpses frequently I felt 
that this would be for the best.
-Removed Virologist's unneeded morgue access.
Revision: r3674
Author: 	 ericgfw...@hotmail.com
 2012-05-29 01:00:39 +01:00
Erthilo
2efb61989b TG: Pacman generators now accept their proper mineral sheets as fuel 
Janitor Cyborgs can no longer make nuke ops auto-lose by picking up the nuke
disk.
Revision: r3673
Author: 	 johnsonmt88
 2012-05-29 00:57:23 +01:00
Erthilo
126e4f1365 TG: - Replaced some hardcoded hallucination strings for screen placement to instead 
use #defines from hud.dm. Please don't use hardcoded constants when there are
variables or defines available...
Revision: r3672
Author: 	 baloh.matevz
 2012-05-29 00:56:13 +01:00
Erthilo
9fa147c6dd TG: -Minor polishing tweak to borg hypos. The recharge time/cost and recharged 
chemicals cut in half (same net amount over time, but it comes more fluidly).
Resets the recharge timer upon
switching modes so your battery charge and chemicals aren't wasted.
-Added the (src)s to the robot modules that I forgot. It all seems to work fine
without them, but just for the sake of consistency...
Revision: r3669
Author: 	 d_h2...@yahoo.com

(Also fixes for equip proc due to two ears.)
 2012-05-29 00:50:14 +01:00
Erthilo
340f4ced91 tg: - Added a equip_to_appropriate_slot() proc for later use with the UI to speed up 
equipping yourself. Human mobs only.
Revision: r3667
Author: 	 baloh.matevz
 2012-05-29 00:43:50 +01:00
Erthilo
835623de13 TG: Added new transfer valve assembly sprites from Baystation 12, and made the 
transfer valve update_icon() a lot simpler and more robust.
Revision: r3666
Author: 	 petethegoat
 2012-05-29 00:40:25 +01:00
Erthilo
112fb5433e TG: - Some runtime-prevention tweaks so that impatient coders don't just break 
everything somewhere down the line.
Revision: r3665
Author: 	 baloh.matevz
 2012-05-29 00:33:25 +01:00
Aryn
a8215ce62f Made some airflow changes. They won't be included in the processing code until they're more thoroughly tested, but the code is here anyway. 2012-05-28 16:42:40 -06:00
Aryn
c9478c6a46 Made SkyMarshal's recommended changes. 2012-05-28 16:41:18 -06:00