cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,545 Commits 6 Branches 0 Tags
3b09c8b3a664120c1b3e57769f8266e7ac8ed88f
Commit Graph

9543 Commits

Author SHA1 Message Date
Cael_Aislinn
38c2179620 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-08 11:49:54 +10:00
Cael_Aislinn
f7aaf631b9 runtime fix in spam event 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-08 09:27:28 +10:00
Chinsky
5fa6414d70 If you aim at people, shots will be slightly more accurate. 2013-03-08 03:21:47 +04:00
Chinsky
81a432930b Bit of refactoring. 
Moved gun icons adding/deletion in separate procs.
Moved dropping aim in separate procs.
Moved gun empty clicking in separate proc because all the copypaste.

Fixed issues with aim mode HUD icons not being updated in some cases.
Now toggling mode cancels aim properly.
Fixed type in firing message.
 2013-03-08 02:56:55 +04:00
Chinsky
4f75feffe5 Added recoil to projectile weapons. 
On shot shakes screen a little.
 2013-03-07 05:55:14 +04:00
Chinsky
56b4f0c85f Fixed couple of issues with suicide - no sound and inability to suicide again if tried to do it without ammo. 2013-03-07 05:54:46 +04:00
Asanadas
4720f4f1ac SYNDICATE? WHAT SYNDICATE? 2013-03-06 18:14:27 -05:00
Asanadas
b82070ecd8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 18:10:47 -05:00
Chinsky
5a916019de Refactored and moved targeting code around a little. 
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
 2013-03-07 00:44:28 +04:00
Chinsky
55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
 2013-03-06 17:04:45 +04:00
Cael_Aislinn
ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 21:18:15 +10:00
Cael_Aislinn
e27d7b2aeb cleanup for a bunch of stuff in arty scanners+harvesters, fix compile errors 2013-03-06 21:05:57 +10:00
Cael_Aislinn
dc794f5dac renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 20:50:17 +10:00
Christian Bielert
12215c588f Merge pull request #2483 from RavingManiac/bleeding-edge-freeze 
Syringestabbing
 2013-03-06 02:00:32 -08:00
Cael_Aislinn
0481c1eb3f reagent data is properly preserved over chemical reactions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:49:57 +10:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00
Christian Bielert
f6efab34e0 Merge pull request #2479 from caelaislinn/bleeding-edge-freeze 
RUST updates, other
 2013-03-06 00:56:20 -08:00
Cael_Aislinn
bb044ded63 added "back" button to go back to last viewed menu for cargo bay computers 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 18:45:38 +10:00
Cael_Aislinn
20a3596460 re-added missing supply packs (supply packs without assigned groups are not orderable) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 18:45:11 +10:00
RavingManiac
33d5e0944c Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 14:43:09 +08:00
Nanodesu
104cc5585d roro to slime fix 2013-03-06 05:59:21 +04:00
RavingManiac
c18999957f You can now stab people with syringes. This destroys the syringe, deals 7 brute damage and injects a random percentage of the syringe's contents into the target. 
Syringestabbing is blocked by shields. Armor on the targeted body part has a 50% chance of deflecting the syringe unless you are stabbing yourself.
 2013-03-06 00:39:29 +08:00
Cael_Aislinn
72ecd516c5 dropped grid check duration 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:45:26 +10:00
Cael_Aislinn
18f6136b25 tweaked a couple of supply packs (crate types, quantities), added missing rust fuel port circuitry supply pack, added supply packs for type 1 TEGs and circulators 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:33:59 +10:00
Cael_Aislinn
efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:32:28 +10:00
Cael_Aislinn
92517638bc removed double announcement for grid checks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:31:40 +10:00
Cael_Aislinn
00b0c09016 core gens start locked, added placeholder core monitor file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:29:48 +10:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:28:57 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:23:16 +10:00
Cael_Aislinn
950c5a84ab updated roundstart music 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:15:12 +10:00
Cael_Aislinn
6f9542cd10 removed debug output for type 2 TEGs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:06:43 +10:00
Cael_Aislinn
9ca69998d0 cleaned up/added some missing icon_states for (rust) engineering areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:51:09 +10:00
Cael_Aislinn
09399cb74b some tweaks and balances to rust circuit research levels 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:47:26 +10:00
Cael_Aislinn
c6398d6d52 fixed some core field runtimes, made it actually process 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:41:10 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:23:59 +10:00
Cael_Aislinn
53cfbaa480 tweaked some rust icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:22:35 +10:00
cib
b25a6cb9bb Typofix 2013-03-05 04:25:21 +01:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
cib
65b8eafe8e Added internal organs. 
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
 2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa Forgot to update the emag code so that the bots explode. 2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70 Added verbs to spiderbot, tweaked access. 2013-03-04 03:26:52 -08:00
Zuhayr
cbc62505e7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-04 01:52:12 -08:00
cib
997c1e63ad Fix for too many changelings. 2013-03-02 19:59:16 +01:00
Christian Bielert
2a9f199441 Merge pull request #2469 from Uristqwerty/Tubes 
Added: Code and icons for tube-based transportation.
 2013-03-02 09:37:01 -08:00
Uristqwerty
b455c42d96 Added: Code and icons for tube-based transportation. 
Just an additional tool that mappers may find interesting or fun. At the moment, they do not use power or any resources, and there is plenty of room to extend and improve them, but they do work.

The basic tubes will read their directions from icon_state if they aren't specifically specified, so you can just use the built-in option to generate instances from icon states to get all possible tubes.
The tube stations use directions, instead.
 2013-03-02 04:17:58 -05:00
cib
df01f9dee6 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2013-03-02 01:11:24 +01:00
Christian Bielert
65ff5dc7f9 Merge pull request #2460 from Gamerofthegame/bleeding-edge-freeze 
Medical hardsuit changes
 2013-03-01 16:07:00 -08:00
Christian Bielert
a211b493c8 Merge pull request #2465 from Zuhayr/bleeding-edge-freeze 
Spiderbots and a bunch of commits from master.
 2013-03-01 16:05:17 -08:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
48fefead00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:38 -08:00