cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 11:06:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,677 Commits 66 Branches 25 Tags
3fb34237ee3158486d67ff1f76507419e92094de
Commit Graph
22677 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PsiOmegaDelta 973bc1c0f3 Merge pull request #8071 from RKF45/newpaint 
Generic Paint II: Fun with Paint
 2015-02-10 06:48:32 +01:00
Zuhayr ffc05aecfa Merge pull request #8091 from PsiOmegaDelta/Cleanit 
Minor cleanup in setup.dm
 2015-02-10 13:41:16 +10:30
MrSnapwalk 05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
mwerezak d8a8384c41 Fixes errors introduced by merge 
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
 2015-02-09 17:53:47 -05:00
Chinsky 1c4734c4e3 Merge pull request #8088 from Raptor1628/dev 
Paramedic Job Fixed
 2015-02-10 01:00:08 +03:00
Chinsky 4deeebfe3e Merge pull request #8093 from GinjaNinja32/pai_pulling 
Fixes pAIs being spammed with "You are too small to pull that." when being pulled
 2015-02-09 19:52:32 +03:00
Chinsky ae54b2efc2 Merge pull request #8092 from GinjaNinja32/webbing 
Fixes webbings utilising bluespace storage for infinite storage
 2015-02-09 18:26:19 +03:00
PsiOmegaDelta a047c55c74 Merge pull request #8095 from DeeUnderscore/isNotStationLevel-fix 
Fix a bug in isNotStationLevel() helper
 2015-02-09 15:53:06 +01:00
D Anzorge 93f3b5b72a Fix a bug in isNotStationLevel() helper 2015-02-09 09:38:48 -05:00
GinjaNinja32 503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
Raptor1628 80c508e644 Pipe move 2015-02-09 08:00:16 -05:00
Zuhayr ec6bb08a58 Merge pull request #8012 from SkyMarshal/icarus 
Adds two admin weapons and refactors wall damage code.
 2015-02-09 22:25:22 +10:30
GinjaNinja32 42bd4e7fba Storage accessory w_class raised to 3, typo fix 2015-02-09 11:15:19 +00:00
GinjaNinja32 70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
PsiOmegaDelta ec1fe5edc7 Merge pull request #8090 from comma/master 
Fixes #8009
 2015-02-09 08:38:50 +01:00
PsiOmega e1e5d993dd Minor cleanup in setup.dm 
Fixes #8074.
 2015-02-09 08:27:38 +01:00
Chinsky 2f52020ce4 Fixed backwards check 2015-02-09 08:26:45 +03:00
Chinsky 5496c7bbf0 Fixes #8009 
Fixed flaslights producing infinite light/
 2015-02-09 08:05:24 +03:00
GinjaNinja32 538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
Raptor1628 76f4001cc1 Paramedic Job Fixed 
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
 2015-02-08 17:23:02 -05:00
PsiOmegaDelta 4cab2a2c8e Merge pull request #8086 from GinjaNinja32/apcfix 
Fixes possible href exploit with APCs
 2015-02-08 21:04:45 +01:00
GinjaNinja32 4495f4c8ed Fixes possible href exploit with APCs 2015-02-08 19:58:28 +00:00
PsiOmegaDelta 31120123b8 Merge pull request #8085 from PsiOmegaDelta/dev 
Dev
 2015-02-08 20:57:00 +01:00
PsiOmega f0c30d2f16 Corrects multiple conflicts in engineering, where areas had changed paths or been replaced. 2015-02-08 20:50:45 +01:00
PsiOmega 91b971b223 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-08 20:29:03 +01:00
Kelenius e6dc9d36fd Update for machine upgrades and some science 
Also adds RPED and makes biogenerator and borg charger constructible .
 2015-02-08 15:39:11 +03:00
SkyMarshalandSkyMarshal a78ef81712 To make PsiOmegaDelta happy 
I hate this format.  Bluh bluh huge bitch
 2015-02-08 04:04:06 -07:00
SkyMarshalandSkyMarshal c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal 84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal dadea3c7fa Adds two admin weapons and refactors wall damage code. 
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
 2015-02-08 04:01:35 -07:00
Chinsky 6e3391f723 Merge pull request #8079 from mwerezak/doors 
Fixes doors being usable remotely when broken
 2015-02-08 13:11:52 +03:00
Chinsky de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00
Chinsky 30de86c081 Accessories update. 
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
 2015-02-08 12:35:50 +03:00
PsiOmegaDelta 187d90c933 Merge pull request #8080 from Kelenius/ofOreAndScanners 
Fixes ore scanner
 2015-02-08 09:50:31 +01:00
Kelenius 71dabeb557 Fixes ore scanner 
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
 2015-02-08 05:52:12 +03:00
RKF45 13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45 db6ff13f5f No painting ghosts! 
Holograms can be coloured, though
 2015-02-07 23:59:34 +01:00
mwerezak 2d744fd47a Fixes doors being usable remotely when broken 
Fixes airlock doors being able to be opened and closed remotely (by
buttons, airlocks, or docking) when broken. Also removes some redundant
code, and refactors a few checks.
 2015-02-07 17:52:16 -05:00
Ccomp5950 8f2720b179 Merge pull request #8052 from mwerezak/boolit 
New bullet types, projectile refactor
 2015-02-07 14:07:22 -05:00
mwerezak fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit 
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2015-02-07 00:57:04 -05:00
Chinsky 03125b97f4 Merge pull request #8056 from PsiOmegaDelta/ATMMachine 
Corrects some RAS syndrome issues
 2015-02-07 08:39:59 +03:00
Chinsky fdd27dec21 Merge pull request #8078 from Ccomp5950/mentors 
Added buttons back to Mentors
 2015-02-07 08:24:30 +03:00
Ccomp5950 33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans 
Update for the slimes
 2015-02-07 00:20:13 -05:00
Ccomp5950 3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup 
Code cleanup
 2015-02-07 00:17:24 -05:00
Ccomp5950 f4b2646da7 Merge pull request #7932 from mwerezak/pacman 
PACMAN update
 2015-02-07 00:15:15 -05:00
Ccomp5950 461202280a Merge pull request #8072 from GinjaNinja32/scramble_consistency 
scramble() consistency
 2015-02-07 00:13:53 -05:00
ccomp5950 a07e0a044f Added buttons back to Mentors 
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
 2015-02-07 00:04:50 -05:00
mwerezak 414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman 
Conflicts:
	code/modules/power/port_gen.dm
 2015-02-06 23:32:39 -05:00
mwerezak f328170b00 Adds two boxes of shotgun shells to the armoury 2015-02-06 20:24:31 -05:00
mwerezak 0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00