cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 6 Branches 0 Tags
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

11520 Commits

Author SHA1 Message Date
GinjaNinja32
c952507f3c Fixes carp attacking mechs over z-levels 
Fixes #9198.
 2015-05-12 15:53:28 +01:00
Zuhayr
f908119b98 Very minor oversight. 2015-05-12 23:56:51 +09:30
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c Cleanup of custom item icons. 2015-05-12 23:21:23 +09:30
Chinsky
009dc181b2 Merge pull request #9203 from mwerezak/vines2 
Updates weed control crate
 2015-05-12 15:58:47 +03:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
 2015-05-12 14:39:21 +02:00
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/projectiles/projectile.dm
 2015-05-12 13:40:47 +02:00
Zuhayr
2222445eb3 Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites 
Adds 7 new AI core sprites and adds new pAI card sprites.
 2015-05-12 21:01:30 +09:30
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
PsiOmegaDelta
d12d1b93d1 Merge pull request #9204 from Ccomp5950/mangled_request 
Holodeck items no longer spam admin attack logs.
 2015-05-12 11:22:02 +02:00
Zuhayr
c8135cf87b Merge pull request #9205 from mwerezak/masks 
Snacks, drinks, and pills now check mouth coverage
 2015-05-12 18:11:48 +09:30
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell 
Adjusts charge cost for energy type guns
 2015-05-12 18:11:39 +09:30
Zuhayr
c84089af3c Merge pull request #9206 from comma/deaddoll 
Preview icon refactor
 2015-05-12 15:59:00 +09:30
Zuhayr
f76a1d2024 Removed custom item defines, refactored mech kits. 2015-05-12 15:49:56 +09:30
PsiOmega
66ead991e7 Terminals, scrubbers, airlocks, and alarms get a Destroy() review. 2015-05-12 08:16:30 +02:00
Zuhayr
59af7e5c4d Refactor/rewrite of custom item spawning. 2015-05-12 15:14:51 +09:30
PsiOmegaDelta
b30465374d Merge pull request #9201 from GinjaNinja32/vine 
Fixes vines not being vines.
 2015-05-12 07:04:41 +02:00
Zuhayr
c06323ef7a Merge pull request #9199 from Techhead0/voidmachine-englishlists 
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
 2015-05-12 14:20:37 +09:30
Chinsky
a6ecdedf74 Fix for being forever tajaran 2015-05-12 07:48:54 +03:00
Chinsky
495783de59 As per Ginja's suggestion, dummies are now used one per prefs datum. 
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
 2015-05-12 07:24:25 +03:00
Techhead0
0d9a482be8 Removes frame_desc from circuitboards. 2015-05-12 00:09:51 -04:00
Zuhayr
3184f157e9 qdel 2015-05-12 13:12:58 +09:30
Chinsky
86c8c8c52b Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart. 
Also fixed a runtime, somehow head was created without a tajaran and got lost.
 2015-05-12 06:42:08 +03:00
mwerezak
b721eb36ef Span classes and visible_message(), changelog 2015-05-11 23:40:44 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Chinsky
5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2015-05-12 06:04:22 +03:00
Chinsky
29823e3552 Changed update_preview_icon to use a human dolly to get all those icons instead of... old way. 
I guess it's more hacky, but fairly shorter and means you don't need to touch that... thing when you add a new job/change existing loadout.
Also changed preference transfer to use appearance procs to properly sync with organ colors.
 2015-05-12 05:55:49 +03:00
mwerezak
b1bfbf346d Snacks, drinks, and pills now check mouth coverage 
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
 2015-05-11 22:17:24 -04:00
ccomp5950
569e785014 Holodeck items no longer spam admin attack logs. 
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
 2015-05-11 22:11:46 -04:00
Zuhayr
abc75718b7 Merge pull request #9179 from PsiOmegaDelta/LevelSevenBioHazard 
Adds announcement to the space vine event
 2015-05-12 11:29:24 +09:30
Miniature
ed60b17f8d Cherrypicking Mini's custom item code. 2015-05-12 11:02:34 +09:30
Zuhayr
4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
mwerezak
56c610e111 Updates weed control crate 
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
 2015-05-11 21:20:16 -04:00
GinjaNinja32
3fc9d89163 Fixes vines not being vines. 2015-05-12 01:56:51 +01:00
Techhead0
f6977dd8ed Changes machine frames and voidsuits to use proc/english_list() 
Also includes formatting changes to voidsuit examine.
 2015-05-11 20:29:35 -04:00
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
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
Atlantis
152156018a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-11 07:46:51 +02:00
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Atlantiscze
6b8f6178da Fixes 
- Fixes few typos in the code
- Fixes AI Eye object being solid, therefore being able to block movement of other players.
- Fixes non-station APCs boosting CPU as others.

Implemented Suggestions
+ Selection is now done in slightly better way (Basic Encryption Hack, Hack/Unlock Cyborg, Hack AI). Only relevant entities are offered in the list.
+ Adds varedit-modifiable variables for CPU Gain and Storage boost. These variables may be used by admin in game or by tester to faster unlock abilities.
+ Slightly nerfed APC CPU power generation.
+ Reworked machine overload. Now it only works on machines which are powered. Unpowered or broken machines cannot be overloaded. /obj/machinery/power type machines (APCs, SMESs, overall most stuff that directly handles electricity) received bonus explosion strength to compensate. Machine overload also drains massive power from local APC, therefore preventing spam of this ability (normal APC should take about 2-3 of these before needing to recharge). Also, qdel instead of del.
+ System Override now uses shuffled list of APCs when hacking them, as opposed to alphabetical list.
+ CPU generation rate is now shown in Status tab.
 2015-05-11 06:36:44 +02:00
mwerezak
d39fc76113 Tweaks space vines 
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
 2015-05-10 23:23:25 -04:00
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr
2adc8df1fa Merge pull request #8903 from Mloc/lightwrite 
Lighting rewrite
 2015-05-11 09:26:04 +09:30
Chinsky
ea28e4aadf Merge pull request #9126 from Techhead0/magbootsOverShoesTwo 
Magboots can be worn over shoes
 2015-05-11 02:48:45 +03:00
Mloc
7780287d3a mood lighting for computers 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Yoshax
b0d10a6508 Fixes some stuff (+2 squashed commit) 
Squashed commit:

[f63e170] Removes unnecessary /

[ac1b52c] re adds 1 bear trap i somehow accidently removed
 2015-05-10 20:43:36 +01:00
Yoshax
86bf94ba07 Refactors bear traps 2015-05-10 20:09:29 +01:00
PsiOmega
144b11ed14 Adds announcement to the space vine event. 2015-05-10 20:40:49 +02:00