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
18,354 Commits 5 Branches 0 Tags
1b8d865061a71d010c5042d4d05e6fb592fdf7c5
Commit Graph

13644 Commits

Author SHA1 Message Date
Mark Aherne
1b8d865061 Work in progress on a major revision of the NanoUI templating system. 2014-07-07 02:05:39 +01:00
Mark Aherne
4703526738 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	nano/templates/escape_pod_console.tmpl
	nano/templates/simple_docking_console_pod.tmpl
 2014-07-06 23:26:26 +01:00
Mark Aherne
4376465f5d Work in progress on a major revision of the NanoUI templating system. 2014-07-06 23:02:09 +01:00
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-07-06 17:50:53 +01:00
Mloc
4981d620d0 Merge pull request #5507 from mwerezak/supply-shuttle-fix 
Supply shuttle fixes
 2014-07-05 23:16:42 +01:00
Boop
8c3f6f2226 fix a world << THING 
(help)
 2014-07-05 20:28:08 +01:00
mwerezak
6d0a3b864d Shuttle now can only be late when arriving 2014-07-05 14:49:30 -04:00
mwerezak
cd6594f223 Fixes shuttle being late AFTER it arrives 2014-07-05 14:44:07 -04:00
mwerezak
0e15d55b24 Fixes #5459 2014-07-05 14:43:18 -04:00
Mloc
bda1dac41c Merge pull request #5502 from mwerezak/robot-actuator 
Fixes #5499
 2014-07-05 11:33:04 +01:00
Mloc
4c2767203c Merge pull request #5503 from mwerezak/heist-fix 
Fixes Heist ending immediately
 2014-07-05 11:32:37 +01:00
Ccomp5950
2bdab3b5d3 Merge pull request #5504 from mwerezak/supply-shuttle-fix 
Fixes the supply shuttle being stuck in warmup if forbidden atoms are aboard
 2014-07-05 04:15:27 -05:00
Ccomp5950
6dafb8e5ed Merge pull request #5479 from comma/overmap 
Couple updates to overmap system thing
 2014-07-05 04:06:16 -05:00
Zuhayr
c9ca3cc43e Removes NO_BLOOD from Vox. 2014-07-05 16:04:10 +09:30
Zuhayr
89964ef0fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-07-05 11:04:03 +09:30
mwerezak
6e5824ac33 Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard 
Might be related to #5459, not sure though.
 2014-07-04 19:52:50 -04:00
mwerezak
d538c5c640 Fixes #5499 2014-07-04 19:35:57 -04:00
mwerezak
1aeb094a79 Fixes Heist ending immediately 2014-07-04 19:06:55 -04:00
Walter0o
3e95ad9786 adds shuttle_control access check to proper place 2014-07-04 21:38:39 +02:00
Walter0o
65b5126147 fixes computers eating cards 
this commit : 
ea1060ac33

added in machinery's attack_hand() proc, line 238
```
if(!allowed(user))
		user << "\red Access Denied."
		return 1
```

to almost all machinery including computers, since they call this proc via their attack_hand() procs.

allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id,
NOT the card inside the machine,
as different machines have different vars and systems handling how they can be accessed.

instead of fixing the underlying problem, eject card verbs were added like this one : 
30385c2237

this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs.
 2014-07-04 21:36:23 +02:00
Zuhayr
34d19d16f5 Fffffff fixes crates not budging properly. 2014-07-05 04:17:12 +09:30
Mloc
53de412107 Merge pull request #5493 from Zuhayr/master 
Fixes
 2014-07-04 19:28:54 +01:00
Chinsky
ff835cee53 Merge pull request #5492 from mwerezak/alarm-icon 
Fixes air alarms not updating when area changes alert status
 2014-07-04 20:56:43 +04:00
Mloc-Argent
25ec90ba26 mob: fix a movement issue 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-04 17:54:25 +01:00
Zuhayr
72e18b9eb5 Fixes #5214 2014-07-04 17:56:06 +09:30
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Zuhayr
67da4096b3 Fixes #5461 2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8 Fixes #5490 2014-07-04 17:39:45 +09:30
Zuhayr
4b06cf82f0 Fixes #5491 2014-07-04 17:34:30 +09:30
mwerezak
ac1a7ad6e2 Fixes air alarms not updating when area changes alert status 2014-07-04 03:00:42 -04:00
Chinsky
c46667bab4 Merge pull request #5489 from PsiOmegaDelta/AirPermissions 
Fixes #5487
 2014-07-04 05:29:13 +04:00
PsiOmega
b86b80f963 Fixes #5487 
Isolation air alarms now expect atmos, engineering, OR research access.
 2014-07-04 00:28:06 +02:00
PsiOmega
9b97420e97 The AI system integrity restorer no longer needs head AND captain access. 2014-07-04 00:12:41 +02:00
Mark Aherne
9276e9f707 This change to nanomanager optimizes the sending of nanoui assets to clients. 
The flist (file list) proc was being used multiple times for each client user logon, this now only occurs once when the server starts.
Hopefully this fixes the nanoui assets issue which occurs during peak usage.
 2014-07-03 22:55:54 +01:00
Zuhayr
e260cf5129 Merge pull request #5480 from Hubblenaut/master 
Fixes earmuffs and custom items for ear slot not showing up properly
 2014-07-04 04:41:25 +09:30
Chinsky
447144f1ad Merge pull request #5477 from PsiOmegaDelta/AngryAI 
Adds a new set of AI status emotes.
 2014-07-03 20:39:51 +04:00
Chinsky
5724a77cdb Merge pull request #5474 from Zuhayr/master 
Fixes climbing through shutters.
 2014-07-03 20:38:56 +04:00
Zuhayr
07acb270d1 Merge pull request #5476 from Hubblenaut/wheelchair 
Wheelchair Fixes
 2014-07-03 13:16:14 +09:30
Hubblenaut
3d1195d1a7 Hides ear equipment on BLOCKHAIR and BLOCKHEADHAIR flags 2014-07-03 03:43:15 +02:00
Hubblenaut
4f7dc5c9f5 Renders ears above hair level, fixes rendering of earmuffs and custom item 2014-07-03 03:30:16 +02:00
Chinsky
e21206340e Merge pull request #5470 from Walter0o/patch-1 
trivial silicon show_system_integrity() fix
 2014-07-03 05:13:21 +04:00
Chinsky
c3f3aaaeed Merge pull request #5473 from mwerezak/supply-console 
Makes the cargo console force-launch command more obvious
 2014-07-03 05:12:03 +04:00
Chinsky
a3cff314bd Merge pull request #5466 from Hubblenaut/master 
Fixes Sasha Mason-Kalinka's custom item
 2014-07-03 05:10:49 +04:00
Chinsky
67c425fe2b Merge pull request #5463 from mwerezak/emergency-shuttle 
Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
 2014-07-03 05:10:35 +04:00
Chinsky
173d7f1828 Merge pull request #5458 from Zuhayr/mutiny 
Mutiny tweaks.
 2014-07-03 05:10:20 +04:00
Chinsky
5c7080a774 Added proc to imitate movement of stars. Changes icon state and throws all unanchored items in space. 
Added var denoting which direction is fore of the ship.
Adjusting speed now applies movement effect on ship's zlevel.

Added working engines system. Only defined type currently is thermal engine.
Acceleration is now based on total thrust and ship's mass.
Added engine control console.

Changed shuttle control console to use custom interface to pick destinations.
Shuttles can now go between any types of sectors, not just ship->sector.
Shuttles cannot return to base if they are too far on overmap.

Moved helm computer to NanoUI.
Helm computer now stores navigation data records instead of polling info from actual overmap objects every time.
Metaobjects now can define if sector is well known, in which case it will be automatically added to helm computer records on creation.
Can add and delete records.
 2014-07-03 04:47:50 +04:00
PsiOmega
a9c6a8cd03 Adds an Upset emote as well. 2014-07-03 00:22:10 +02:00
Hubblenaut
6a25d59f9a Gives test-firing an actual use 2014-07-02 23:14:41 +02:00
PsiOmega
0892d6315d Adds a new set of AI status emotes. 
The AI can now express anger and surprise.
 2014-07-02 23:09:46 +02:00
Hubblenaut
4981f3409f Fixes wrong person getting movement penalty 2014-07-02 22:43:17 +02:00